External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-01 09:38:10 -03:30
Code Issues Packages Projects Releases Wiki Activity
21,831 Commits 55 Branches 102 Tags
43c552c7c64a17e14fb4540ffd97b7482bad11ce
Commit Graph

21831 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
softwarefactory-project-zuul[bot]
38aedcdd48 Merge pull request #4136 from Spredzy/revert_makefile 
Revert "Makefile: align pip and setuptools bump"

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-21 13:42:26 +00:00
softwarefactory-project-zuul[bot]
59bec99f4c Merge pull request #4128 from tchellomello/k8s-annotations 
Introduces the ability to pass annotations to the Kubernetes Ingress Controllers

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-21 13:14:47 +00:00
Alex Corey
b0249a9a8b Addressed PR Issues 2019-06-21 08:58:51 -04:00
chris meyers
acb6d9c4d1 wrap smart inv cache update w/ advisory lock 
* Two job templates that use the same smart inventory running at the
same time can easily race to recompute the smart inventory <-> host
mapping. In this case, bulk_create() can throw an error when racing.
* The per-smart-inventory advisory lock ensures that the state of the
system is consistent & that bulk_create() runs in isolation.
 2019-06-21 08:52:34 -04:00
Yanis Guenane
78912d20f7 Revert "Makefile: align pip and setuptools bump" 
This reverts commit ec92abf014.
 2019-06-21 11:52:22 +02:00
Marcelo Mello
52712a0d9a Introduces the ability to pass annotations to the Kubernetes Ingress Controllers 2019-06-20 16:40:08 -04:00
Michael Abashian
cb50cdce0d Add support for launching job templates from the templates list (#277) 
Add support for launching job templates from the templates list
 2019-06-20 15:21:57 -04:00
Jake McDermott
cd672baa13 Merge pull request #284 from jakemcdermott/move-yaml-test 
move yaml test to utils
 2019-06-20 15:00:08 -04:00
Jake McDermott
30709d1ab2 Merge pull request #283 from jakemcdermott/has 
prefix content error and loading booleans with 'has'
 2019-06-20 14:59:52 -04:00
Jake McDermott
f382fce576 move yaml test to utils 2019-06-20 14:47:39 -04:00
Jake McDermott
36d2d03bc7 prefix content error and loading booleans with 'has' 2019-06-20 14:37:46 -04:00
Michael Abashian
b21e491075 Updates to contributing doc (#280) 2019-06-20 13:32:25 -04:00
Alex Corey
a7c787af02 Adds notify on start toggle 2019-06-20 13:07:09 -04:00
Marliana Lara
740402e5a8 Merge pull request #279 from mabashian/templates-routes 
Add basic routing for templates
 2019-06-20 12:11:22 -04:00
Marliana Lara
5662d8b625 Remove Fragment 2019-06-20 12:01:43 -04:00
mabashian
af6ea1cc58 Notifications plural 2019-06-20 11:34:16 -04:00
mabashian
f185d80b05 Fix border bottom on tabs 2019-06-20 11:33:15 -04:00
mabashian
0a5f29ad22 Add basic routing for templates 2019-06-20 10:57:04 -04:00
softwarefactory-project-zuul[bot]
e269634afc Merge pull request #4112 from jbradberry/fix-3603 
Use the `in` operator to test against the Organization membership subquery

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-20 12:56:08 +00:00
Jake McDermott
3b7b27ea20 Merge pull request #276 from jlmitch5/testWatchFix 
fix jest.config.js so `npm run test-watch` works
 2019-06-20 08:25:56 -04:00
softwarefactory-project-zuul[bot]
4daf574899 Merge pull request #4114 from shanemcd/revert-pip-and-setuptools 
Revert pip and setuptools

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-20 02:42:04 +00:00
softwarefactory-project-zuul[bot]
067ba7f8fe Merge pull request #4116 from tchellomello/ca_trust_dir_project_data_dir 
Fixes ca_trust_dir and project_data_dir for Kubernetes

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-20 02:19:25 +00:00
Marcelo Mello
7d77727a60 project_data_dir is not required in the awx_task containers 2019-06-19 21:35:49 -04:00
Marcelo Mello
47560fdf7c Fixes ca_trust_dir and project_data_dir for Kubernetes 2019-06-19 21:21:35 -04:00
John Mitchell
7fee9e35c4 fix jest.config.js so npm run test-watch works 2019-06-19 16:41:19 -04:00
Shane McDonald
2882f4afb5 Revert "upgrade pip and setuptools" 
This reverts commit 76ebcf914b.
 2019-06-19 16:02:52 -04:00
Shane McDonald
aaceccc426 Revert "Fix offline builds" 
This reverts commit fe850dff38.
 2019-06-19 16:02:43 -04:00
softwarefactory-project-zuul[bot]
1f3242900a Merge pull request #4098 from beeankha/any_notification_migration 
Update "Notify On Start" Migration File

Reviewed-by: Ryan Petrello
             https://github.com/ryanpetrello
 2019-06-19 19:57:12 +00:00
softwarefactory-project-zuul[bot]
e6232957b4 Merge pull request #4079 from ryanpetrello/ldap-setting-flake 
work around a unit test that's periodically flaky

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-19 18:55:24 +00:00
Jeff Bradberry
1a72ff4c47 Use the in operator to test against the Organization membership subquery 
If more than one Organization were selected by this subquery, then
Postgres would complain with "more than one row returned by a subquery
used as an expression".  We needed to allow for that case.

Annoyingly SQLite3 doesn't seem to care, so writing a py.test test to
exercise this isn't feasible under our current development setup.
 2019-06-19 14:49:02 -04:00
Jake McDermott
f33b343cd8 Merge pull request #274 from jakemcdermott/alias-top-level-imports 
alias top-level imports
 2019-06-19 13:09:26 -04:00
softwarefactory-project-zuul[bot]
c585c3d07d Merge pull request #4105 from rooftopcellist/fix_instance_counts 
Fixes analytics & metrics instance specific job counts

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-19 16:49:09 +00:00
softwarefactory-project-zuul[bot]
1413c1be7b Merge pull request #4074 from ryanpetrello/whoopsie 
fix a bug introduced in the inventory source detail API by v1 removal

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-19 15:52:47 +00:00
Jake McDermott
012852ec53 alias top-level imports 2019-06-19 11:45:57 -04:00
Michael Abashian
ee56e9ccfb Reorganize file locations/directory structure (#270) 
Reorganize file locations
 2019-06-19 11:41:14 -04:00
Christian Adams
a5c057cc18 Fixes analytics & metrics instance specific job counts 2019-06-19 11:32:05 -04:00
softwarefactory-project-zuul[bot]
9c06dc7106 Merge pull request #4106 from shanemcd/fix-offline-builds 
Downgrade pip

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-18 23:17:48 +00:00
Shane McDonald
fe850dff38 Fix offline builds 
pip 19 added support for something called `pyproject.toml`. Several packages have been setting the option `build-backend = "setuptools.build_meta”` (bcrypt, attrs, jaraco) which seems to be the root of the problem when building from source. Until the community sorts this out I’m inclined to avoid pip 19.
 2019-06-18 18:48:54 -04:00
Keith Grant
e3cb8d0447 Add JSON/YAML components (#267) 
Add CodeMirrorInput and VariablesField

Add components for syntax highlighting, YAML/JSON toggle
 2019-06-18 12:32:22 -07:00
Marliana Lara
0b10ff7fe6 Merge pull request #268 from marshmalien/263-org-badge-count-styles 
Group organization list user and member badges
 2019-06-18 13:53:32 -04:00
beeankha
40840e3789 Update migration file to indicate there is no reverse function in case of a rollback 2019-06-18 12:57:50 -04:00
softwarefactory-project-zuul[bot]
e3750f541e Merge pull request #4096 from mabashian/4091-workflow-form 
Fix field enablement on workflow form

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-18 16:15:57 +00:00
Marliana Lara
c9a4cb7696 Reduce gap between organization list count badges 2019-06-18 12:07:08 -04:00
softwarefactory-project-zuul[bot]
5d49fe2170 Merge pull request #4097 from shanemcd/five-dot-oh-dot-oh 
Bump version to AWX 5.0.0

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-18 14:43:25 +00:00
softwarefactory-project-zuul[bot]
ca0e8102fd Merge pull request #3982 from beeankha/notify_on_start 
Notification On Job Start

Reviewed-by: Bianca Henderson <beeankha@gmail.com>
             https://github.com/beeankha
 2019-06-18 14:23:58 +00:00
Shane McDonald
08aff9bd2c AWX 5.0.0 5.0.0 2019-06-18 10:12:42 -04:00
mabashian
164d305b51 More canAddWorkflowJobTemplate cleanup 2019-06-18 09:16:19 -04:00
mabashian
4d33e484d0 Fix field enablement on workflow form 2019-06-18 09:10:49 -04:00
softwarefactory-project-zuul[bot]
1897b18a6e Merge pull request #4090 from Spredzy/bump_pip 
Makefile: align pip and setuptools bump

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-17 20:52:44 +00:00
Yanis Guenane
ec92abf014 Makefile: align pip and setuptools bump 
Signed-off-by: Yanis Guenane <yanis@guenane.org>
 2019-06-17 21:58:42 +02:00