Chris Meyers
e20599d7bb
Merge pull request #580 from chrismeyersfsu/fix-project_update_cascade_tower
...
cascade cancel proj update when job canceled
2017-11-15 11:19:35 -05:00
Chris Meyers
9288b53015
cascade cancel proj update when job canceled
...
* Implicit project update, launch_type='sync', get "associated" with a
job via project_update. When a job is canceled, so should this implicit
project update. This change enforces that logic.
2017-11-15 11:17:52 -05:00
Ryan Petrello
82be0a8af2
Merge pull request #579 from ryanpetrello/fix-survey-encryption-migration-failure
...
fix a bug in the survey reencryption migration
2017-11-15 10:38:35 -05:00
Ryan Petrello
35c374fc79
fix a bug in the survey reencryption migration
...
see: https://github.com/ansible/ansible-tower/issues/7046
2017-11-15 10:26:46 -05:00
Alan Rominger
dbe135991b
Merge pull request #575 from AlanCoding/single_cancel
...
do not propogate cancel of inventory sync back up to project
2017-11-15 09:46:41 -05:00
Ryan Petrello
3a2ec25fb4
Merge pull request #649 from ryanpetrello/multicred
...
fix a permissions bug for credentials specified at JT launch time
2017-11-15 08:49:08 -05:00
Ryan Petrello
fa09d68603
add a few minor optimizations and some refactoring for multi-cred
2017-11-14 16:47:28 -05:00
Ryan Petrello
eb140d9e69
fix a permissions bug for credentials specified at JT launch time
...
hat tip to @alancoding for spotting this one
2017-11-14 16:21:05 -05:00
Bill Nottingham
64f89b3fce
Merge pull request #578 from wenottingham/protect-our-environment
...
Remove some environment variables the callback plugin doesn't actually use
2017-11-14 16:10:53 -05:00
Bill Nottingham
aaaae87aa7
Remove some environment variables the callback plugin doesn't actually use.
2017-11-14 15:57:49 -05:00
Jared Tabor
5852c16ba6
Merge pull request #613 from jaredevantabor/fix-569
...
removing codemirror instantiation from $transition event
2017-11-14 11:09:41 -08:00
Ryan Petrello
ebd8941439
Merge pull request #595 from ryanpetrello/multicred
...
replace all Job/JT relations with a single M2M credentials relation
2017-11-14 14:07:18 -05:00
Jared Tabor
32cb18fc85
removing codemirror instantiation from $transition event
2017-11-14 10:24:36 -08:00
Marliana Lara
aeb8eb3d1e
Fix jshint errors
2017-11-14 13:23:05 -05:00
Marliana Lara
6654cc35f7
Add relaunch component to Completed Jobs list
2017-11-14 13:04:20 -05:00
Ryan Petrello
28ce9b700e
replace all Job/JT relations with a single M2M credentials relation
...
Includes backwards compatibility for now-deprecated .credential,
.vault_credential, and .extra_credentials
This is a building block for multi-vault implementation and Alan's saved
launch configurations (both coming soon)
see: https://github.com/ansible/awx/issues/352
see: https://github.com/ansible/awx/issues/169
2017-11-14 12:49:12 -05:00
Bill Nottingham
0558bd82bb
Fix extra whitespace in callback URL.
2017-11-14 12:03:52 -05:00
Ryan Petrello
f887aaa71f
Merge pull request #637 from ryanpetrello/fix-django-settings-bug
...
undo an optimization in django.conf.settings that breaks awx settings
2017-11-14 11:56:24 -05:00
Marliana Lara
69ada03b7b
Add relaunch component to Job Results panel
2017-11-14 11:51:53 -05:00
Marliana Lara
ee6beae50a
Add relaunchButton component and styles
2017-11-14 11:41:46 -05:00
Matthew Jones
799feac0e1
Merge pull request #638 from shanemcd/devel
...
Fix OpenShift configmap
2017-11-14 11:40:12 -05:00
Shane McDonald
0d86678a44
Fix OpenShift configmap
...
These variables changed in 8faf5887754addeb4940f73a6e02a380f7623541
2017-11-14 11:32:05 -05:00
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
