shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 23:51:09 +03:00
Code Releases Activity
21,137 Commits 40 Branches 19 Tags 380 MiB
4470e9ca26
Commit Graph

21137 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
softwarefactory-project-zuul[bot]
4470e9ca26
Merge pull request #4178 from rooftopcellist/collection_datetime_str 
Fix collection datetime for isolated instance info

Reviewed-by: Elijah DeLee <kdelee@redhat.com>
             https://github.com/kdelee
 2019-06-27 20:03:46 +00:00
softwarefactory-project-zuul[bot]
cf0fe729f5
Merge pull request #4039 from mabashian/application-lookup-column 
Fix user token application lookup column widths

Reviewed-by: Michael Abashian
             https://github.com/mabashian
 2019-06-27 18:31:48 +00:00
mabashian
913e06b865 Fix user token application lookup column widths 2019-06-27 13:32:51 -04:00
Christian Adams
4d7c49372c Fix collection datetime for isolated instance info 
* 'last_isolated_check' was a non JSON-serializable object and needed to be a str
 2019-06-27 13:31:10 -04:00
softwarefactory-project-zuul[bot]
5c338e582a
Merge pull request #4167 from ryanpetrello/csp 
add a reasonable default Content Security Policy

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-26 20:21:20 +00:00
Ryan Petrello
eacf819caf
add a reasonable default Content Security Policy 
ideally we'd improve this over time to remove the `unsafe-inline` lines,
but we can't due that today because Angular1 makes use of a lot of
inline <script> and <style> tag generation

see: https://github.com/ansible/awx/issues/2056
 2019-06-26 10:46:26 -04:00
softwarefactory-project-zuul[bot]
273415b9aa
Merge pull request #4077 from j-shade/devel 
fixed row item labels to view horizontally instead of vertically

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-26 12:50:16 +00:00
Jeremy Shade
e612a167e2
fixed row item labels to view horizontally instead of vertically 2019-06-26 08:22:20 -04:00
softwarefactory-project-zuul[bot]
0a7d6e603e
Merge pull request #4165 from shanemcd/sane-working-dir 
Use the source tree as the working directory for our dev env

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-26 00:58:37 +00:00
Shane McDonald
f05bed6366 Use the source tree as the working directory for our dev env 2019-06-25 18:28:01 -04:00
softwarefactory-project-zuul[bot]
cbe6c5bd3b
Merge pull request #4164 from aubrel/devel 
Change `docker_service` to `docker_compose`.

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-25 21:45:49 +00:00
aubrel
e9ac44f561 Change docker_service to docker_compose. 
Signed-off-by: aubrel <red_clover@riseup.net>
 2019-06-25 15:58:52 -04:00
softwarefactory-project-zuul[bot]
aab29bef5b
Merge pull request #4141 from ryanpetrello/ovirt4-dep-bump 
bump ovirtsdk version to 4.3.0

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-24 21:18:40 +00:00
softwarefactory-project-zuul[bot]
9f42d9426c
Merge pull request #4137 from chrismeyersfsu/fix-smart_inv_race 
wrap smart inv cache update w/ advisory lock

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-21 20:25:10 +00:00
softwarefactory-project-zuul[bot]
b369609f07
Merge pull request #4103 from AlexSCorey/79-NotifyOnJobStart 
Adds notify on start toggle

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-21 16:51:52 +00:00
Ryan Petrello
01d31231c0
bump ovirtsdk version to 4.3.0 
see: bfc6a2a8d6
 2019-06-21 12:49:16 -04:00
softwarefactory-project-zuul[bot]
c46be3e718
Merge pull request #4083 from rmkraus/devel 
Updated ovirt4 dynamic inventory script.

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-21 16:40:29 +00:00
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
Alex Corey
a7c787af02 Adds notify on start toggle 2019-06-20 13:07:09 -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
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
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
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
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
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
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 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
softwarefactory-project-zuul[bot]
5ed7db8cc2
Merge pull request #4085 from mabashian/4082-inv_obj 
Ensure inventory_obj is on scope before checking it

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-17 18:08:43 +00:00
beeankha
69502bc133 Add functions in migration file for deleting and altering 'any' state notifications 2019-06-17 10:47:58 -04:00