Ryan Petrello
38f893c124
undo an optimization in django.conf.settings that breaks awx settings
2017-11-14 11:03:50 -05:00
Greg Considine
a2b444f179
Merge pull request #625 from gconsidine/ui/fix/home-dashboard-popover
...
Revert versions of D3 used by awx and ansible/nvd3
2017-11-14 10:48:40 -05:00
Matthew Jones
f46bacdeaa
Merge pull request #636 from ansible/fix_celery_inspector
...
Delay instantiation of the celery app for the inspector
2017-11-14 10:42:10 -05:00
Matthew Jones
9ee77a95c6
Delay instantiation of the celery app for the inspector
...
This keeps the instance from re-using a pool that might have already
expired and is unusable for the inspector that needs to run as part of
the task manager
2017-11-14 10:33:47 -05:00
Alan Rominger
93b80307db
Merge pull request #624 from AlanCoding/dev_super
...
get development supervisor use working again
2017-11-14 10:14:11 -05:00
Alan Rominger
0a883edd4d
Merge pull request #632 from AlanCoding/some_test_fixes
...
do not use expensive visible_roles for Activity Stream filter
2017-11-14 09:56:27 -05:00
gconsidine
4cd9556f7b
Revert versions of D3 used by awx and ansible/nvd3
2017-11-14 09:47:25 -05:00
Wayne Witzel III
9ed2a0da8f
Merge pull request #627 from wwitzel3/devel
...
Fix image_build
2017-11-14 08:53:21 -05:00
AlanCoding
7eac219eae
do not use expensive visible_roles for Act Stream filter
2017-11-14 08:37:14 -05:00
AlanCoding
805170ffd7
get development supervisor use working again
2017-11-13 20:31:32 -05:00
Wayne Witzel III
d696f6c3f6
Fix image_build
2017-11-13 19:11:58 -05:00
Wayne Witzel III
3cdeb446c4
Merge pull request #622 from wwitzel3/devel
...
Using metavar with a flag is not allowed or useful
2017-11-13 17:12:03 -05:00
Wayne Witzel III
58737a8e28
Using metavar with a flag is not allowed or useful
2017-11-13 16:05:54 -05:00
Wayne Witzel III
2fb74f5b02
Merge pull request #621 from wwitzel3/devel
...
Fix mgmt cmds, use real types not strings
2017-11-13 15:38:19 -05:00
Wayne Witzel III
768a3f62f1
Fix mgmt cmds, use real types not strings
2017-11-13 15:32:31 -05:00
Bill Nottingham
b03a64dd53
Merge pull request #567 from wenottingham/the-source--not-just-a-magazine
...
Assorted updates to project_update.yml
2017-11-13 15:18:42 -05:00
Ryan Petrello
44a2d7a346
Merge pull request #577 from ryanpetrello/release_3.2.2
...
render survey_spec for display purposes in a safe manner
2017-11-13 15:18:09 -05:00
Shane McDonald
386382c456
Merge pull request #619 from wwitzel3/devel
...
Fix installer references to asgi_amqp
2017-11-13 14:10:58 -05:00
Wayne Witzel III
d9f8f7721a
Fix installer references to asgi_amqp
2017-11-13 13:39:39 -05:00
Wayne Witzel III
d2711f4af0
Merge pull request #618 from wwitzel3/devel
...
Silence models.E006 until rename the Project and InventorySource
2017-11-13 13:23:15 -05:00
Wayne Witzel III
77fd7ea4a8
Silence models.E006 until we can rename the Project and InventorySource models
2017-11-13 13:19:29 -05:00
Ryan Petrello
be00b1ca96
render survey_spec for display purposes in a safe manner
...
survey_spec is a nested dict, so if we don't `deepcopy()` it, updates
to the individual fields could corrupt the original data structure;
this was causing a bug whereby activity stream updates converted
encrypted survey password defaults -> `$encrypted$`, but inadvertently
modified the originating model due to shared references
see: https://github.com/ansible/ansible-tower/issues/7769
2017-11-13 13:01:56 -05:00
Wayne Witzel III
faa5a5e024
Merge pull request #600 from wwitzel3/django111
...
Upgrade AWX major dependencies
2017-11-13 12:26:04 -05:00
Wayne Witzel III
798d27c2cb
Fix task_manager test
2017-11-13 12:02:00 -05:00
Wayne Witzel III
5b4dc9e7ee
Disable group sending in consumer (Issue ansible/awx#615 )
2017-11-13 10:19:14 -05:00
AlanCoding
33574d70c8
do not propogate cancel of inventory sync back up to project
2017-11-13 08:44:00 -05:00
Wayne Witzel III
f118e27047
Flake8 fixes and URL updates
2017-11-10 17:04:33 -05:00
Michael Abashian
2ab33467d8
Merge pull request #601 from mabashian/275-delete-warnings
...
More verbose delete warnings
2017-11-10 16:40:12 -05:00
mabashian
42a6757a10
Pass params in object to request function
2017-11-10 16:14:40 -05:00
gconsidine
aa38c1123c
Check for null resource and update e2e model usage
2017-11-10 15:59:38 -05:00
gconsidine
5fcff09aae
Update string-related component tests
2017-11-10 12:33:27 -05:00
Ryan Petrello
bc705ad8ce
Merge pull request #574 from ryanpetrello/fix-7764
...
properly perform validation on encrypted survey defaults
2017-11-10 12:07:54 -05:00
mabashian
5e2ecda413
Define type in delete jt unit test
2017-11-10 11:55:41 -05:00
mabashian
25dc3f8778
Update delete modals and fixed unit test failures
2017-11-10 11:31:11 -05:00
Michael Abashian
2957f5bc7f
Merge pull request #1 from gconsidine/275-delete-warnings
...
275 delete warnings
2017-11-10 11:28:33 -05:00
Ryan Petrello
78961c8037
properly perform validation on encrypted survey defaults
...
see: https://github.com/ansible/ansible-tower/issues/7764
2017-11-10 10:52:09 -05:00
gconsidine
8713e38c44
Update the base model to use string service instead of each sub model
2017-11-10 10:42:05 -05:00
Wayne Witzel III
96904968d8
Fix migration issues, tests, and templates
2017-11-09 17:29:48 -05:00
Wayne Witzel III
6d6bbbb627
Update URL strucuture, fixed string based calls
2017-11-09 17:24:04 -05:00
Wayne Witzel III
14c5123fda
Update celery environ and tasks
2017-11-09 17:21:19 -05:00
Wayne Witzel III
de376292ba
Update management commands
2017-11-09 17:18:18 -05:00
Wayne Witzel III
8faf588775
Update package versions, settings, and tooling
2017-11-09 17:17:30 -05:00
gconsidine
e8fd40ace0
Update model request interface and references
2017-11-09 17:01:32 -05:00
Bill Nottingham
a2b18a9f6e
Add test to short-circuit checkout if revision is already checked out.
...
Move role checkout to a separate play, to work with this.
2017-11-08 18:29:59 -05:00
Jake McDermott
8f6289707b
Merge pull request #596 from jakemcdermott/stored-xss-test
...
add test suite for stored xss
2017-11-08 16:47:03 -05:00
mabashian
4cd2f93c31
Updated delete warnings to indicate resources that may be invalidated as a result of deletion
2017-11-08 16:38:34 -05:00
Alan Rominger
e22486ada8
Merge pull request #573 from AlanCoding/7765
...
[3.2.2] fix bug of system auditor 404 viewing job
2017-11-08 11:16:28 -05:00
AlanCoding
0051da95c9
fix bug of system auditor 404 viewing job
2017-11-08 10:44:41 -05:00
Ryan Petrello
122142c040
Merge pull request #572 from ryanpetrello/isolated-debug-toolkit
...
add some useful tools for isolated connectivity debugging
2017-11-08 10:08:05 -05:00
Ryan Petrello
91ad0a9f89
add a useful tool for isolated connectivity debugging
2017-11-08 09:27:33 -05:00
