25773 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
mabashian	f29144ba91	Fixes bug where all_parents_must_converge was not being set for new or existing approval nodes.	2020-05-18 13:23:57 -04:00
softwarefactory-project-zuul[bot]	49edaab861	Merge pull request #7048 from rooftopcellist/update_po_files_11.2.0 ... Update PO and POT translation files for 11.2.0 Reviewed-by: https://github.com/apps/softwarefactory-project-zuul	2020-05-18 17:08:23 +00:00
softwarefactory-project-zuul[bot]	4b02e4ab57	Merge pull request #7045 from rooftopcellist/mark_after_db ... Mark job_explanation strings after they are read from the db Reviewed-by: https://github.com/apps/softwarefactory-project-zuul	2020-05-18 15:46:27 +00:00
softwarefactory-project-zuul[bot]	60d2409321	Merge pull request #6743 from john-westcott-iv/version_warning ... Adding version checking to collection Reviewed-by: Bianca Henderson <beeankha@gmail.com> https://github.com/beeankha	2020-05-18 15:16:35 +00:00
softwarefactory-project-zuul[bot]	9d420df632	Merge pull request #6950 from AlexSCorey/6903-InventorySourceSyncAll ... Adds Inventory Source Sync Button Reviewed-by: https://github.com/apps/softwarefactory-project-zuul	2020-05-18 14:18:27 +00:00
Alan Rominger	22cdc129ad	Patches from tinkering with tests and default to devel version (#8) ... This causes make install_collection to avoid templating the version so that it can still be used as-is in development	2020-05-18 08:51:39 -04:00
Christian Adams	048c394897	Update PO and POT translation files for 11.2.0	2020-05-15 22:53:36 -04:00
Christian Adams	19ccb5e213	Mark job_explanation strings after they are read from the db ... - For strings that need to be translated, but are saved in the db: * They must be marked for translation using gettext_noop() to be translated. * And must also be marked for translation with _() when read from db and shown to the user. * [Ref]: https://docs.djangoproject.com/en/3.0/topics/i18n/translation/#marking-strings-as-no-op	2020-05-15 22:50:50 -04:00
softwarefactory-project-zuul[bot]	8006b24ae3	Merge pull request #7046 from rooftopcellist/rm_dockerfile-sync ... Remove unneeded dockerfile-sync Reviewed-by: https://github.com/apps/softwarefactory-project-zuul	2020-05-15 23:08:08 +00:00
softwarefactory-project-zuul[bot]	95dd3dbfbd	Merge pull request #7044 from jladdjr/foreman_group_prefix_should_apply_to_all_groups ... foreman: use group_prefix for all groups Reviewed-by: https://github.com/apps/softwarefactory-project-zuul	2020-05-15 21:56:31 +00:00
Christian Adams	7e0ef6dd7b	Remove unneeded dockerfile-sync	2020-05-15 17:43:07 -04:00
Jim Ladd	d242932837	foreman: use group_prefix for all groups ... * awx's "compatibility layer" for the foreman plugin had the group_prefix hard-coded to 'foreman_'	2020-05-15 11:59:29 -07:00
softwarefactory-project-zuul[bot]	99701e4112	Merge pull request #7039 from ryanpetrello/more-downstream-fixes-to-merge ... merge in a few downstream fixes Reviewed-by: Chris Meyers https://github.com/chrismeyersfsu	2020-05-15 17:15:50 +00:00
softwarefactory-project-zuul[bot]	556cd40440	Merge pull request #7038 from ryanpetrello/idle-button-i18n ... mark the idle dialog continue button for translation Reviewed-by: https://github.com/apps/softwarefactory-project-zuul	2020-05-15 17:10:09 +00:00
Ryan Petrello	c7bb5a3e7b	Merge branch 'downstream' into devel	2020-05-15 12:38:47 -04:00
Ryan Petrello	3c195eed9f	mark the idle dialog continue button for translation	2020-05-15 12:35:05 -04:00
softwarefactory-project-zuul[bot]	c7db982ab1	Merge pull request #7032 from ryanpetrello/egg-info-bye-bye ... stop pre-generating awx.egg-info for the development environment Reviewed-by: https://github.com/apps/softwarefactory-project-zuul	2020-05-15 16:19:18 +00:00
Ryan Petrello	54178a1982	stop pre-generating awx.egg-info	2020-05-15 11:47:53 -04:00
softwarefactory-project-zuul[bot]	b69b53f527	Merge pull request #7030 from beeankha/fix_misc_flake8 ... Clearing Up Linter Errors Reviewed-by: https://github.com/apps/softwarefactory-project-zuul	2020-05-15 14:47:04 +00:00
softwarefactory-project-zuul[bot]	d0270a1bac	Merge pull request #7017 from wenottingham/honey-i-shrunk-the-container ... Rework dev & prod container builds Reviewed-by: Christian Adams <rooftopcellist@gmail.com> https://github.com/rooftopcellist	2020-05-15 14:36:53 +00:00
beeankha	438929007e	Unpin specific flake8 version	2020-05-15 10:02:59 -04:00
AlanCoding	b904ad68a6	recover line deletes	2020-05-15 09:44:31 -04:00
John Westcott IV	b7ab6ba9bb	Attempting to fix py2 test issues	2020-05-15 09:26:34 -04:00
beeankha	b80127dd40	Fix up unit tests (no more double mocking)	2020-05-15 09:26:33 -04:00
beeankha	09c10a6f59	Fix linter issue	2020-05-15 09:26:33 -04:00
Caleb Boylan	7478a2aa5e	Rework some of our package tooling	2020-05-15 09:26:33 -04:00
beeankha	6a9423626c	Add field numbering specification in module_util file, update unit tests	2020-05-15 09:26:29 -04:00
John Westcott IV	31a11cf6bb	Attempting to fix py2 test issues	2020-05-15 09:24:44 -04:00
beeankha	4321c63165	Remove silence_warning (because of autouse), add version/type warning tests to module_utils unit test file	2020-05-15 09:24:44 -04:00
beeankha	8c5d236066	Update unit tests to not pull in version warnings	2020-05-15 09:24:43 -04:00
John Westcott IV	81eb9bb78a	Now using new X-API headers to test version and type	2020-05-15 09:24:43 -04:00
John Westcott IV	762d8a287e	Adding version checking to collection	2020-05-15 09:24:43 -04:00
Shane McDonald	c370cb4d93	Get OpenShift / arbitrary user ids working again	2020-05-15 08:32:43 -04:00
beeankha	83bb3bba08	Move import line up	2020-05-14 18:33:11 -04:00
softwarefactory-project-zuul[bot]	30610f1a62	Merge pull request #7014 from nixocio/ui_update_chip_group ... Update usage of new custom `ChipGroup` Reviewed-by: https://github.com/apps/softwarefactory-project-zuul	2020-05-14 21:35:37 +00:00
beeankha	a3e95ab171	Fix unit test failure	2020-05-14 16:39:39 -04:00
softwarefactory-project-zuul[bot]	275c43bd4a	Merge pull request #7026 from 0xflotus/patch-1 ... (docs): enabled syntax highlighting for http patch Reviewed-by: Ryan Petrello https://github.com/ryanpetrello	2020-05-14 20:11:00 +00:00
beeankha	479ab8550d	Fix misc. linter errors	2020-05-14 15:43:50 -04:00
Bill Nottingham	6924466c0b	Also precreate /venv in /dev with modifiable permissions.	2020-05-14 15:33:21 -04:00
Bill Nottingham	1808bed2e8	Add nss for the chrome UI unit tests	2020-05-14 15:32:06 -04:00
Bill Nottingham	d5817fd87a	Remove repo files no longer used in build process	2020-05-14 15:02:32 -04:00
Bill Nottingham	8b51e8eb82	Stage rsyslog.conf from existing version so we don't have two copies.	2020-05-14 15:02:32 -04:00
Bill Nottingham	66245d3094	Reorganize both dev and prod container builds ... Use only one (templated) docker file for both builds. Move to two-stage container builds in order to save space in the final image.	2020-05-14 15:02:32 -04:00
Bill Nottingham	a057277823	Install config-watcher as 0755 rather than chmod'ing it later	2020-05-14 15:02:11 -04:00
softwarefactory-project-zuul[bot]	7852f4f054	Merge pull request #7029 from rooftopcellist/rm_redundant_target ... Remove redundant dev image build make target Reviewed-by: https://github.com/apps/softwarefactory-project-zuul	2020-05-14 18:46:31 +00:00
Alex Corey	d0bbf8c711	Fixes testing issues and removes list item action buttons	2020-05-14 13:32:48 -04:00
Christian Adams	c02f6b9ece	Remove redundant dev image build make target	2020-05-14 13:21:46 -04:00
softwarefactory-project-zuul[bot]	e078ac1c80	Merge pull request #7020 from Wilk42/devel ... Support adding/removing notifications to multiple awx modules Reviewed-by: https://github.com/apps/softwarefactory-project-zuul	2020-05-14 17:15:49 +00:00
0xflotus	5d82d89dc2	enabled syntax highlighting	2020-05-14 18:54:06 +02:00
0xflotus	78e51d5159	(docs): enabled syntax highlighting for http patch	2020-05-14 18:49:48 +02:00