Commit Graph

16466 Commits

Author SHA1 Message Date
adamscmRH fd7c078a8b update docs 2018-03-08 12:10:29 -05:00
adamscmRH 06bacd7bdc add serializer for token detail 2018-03-08 12:03:50 -05:00
Marliana Lara 6f23147d98 Style migrations/pending page 2018-03-08 11:47:59 -05:00
Alan Rominger 3605dbfd73 Merge pull request #1472 from AlanCoding/more_deps
Add shade back into AWX requirements
2018-03-08 11:04:20 -05:00
Michael Abashian 599d84403b Merge pull request #1425 from mabashian/169-credentials
Added add/replace credential validation on jt launch and schedule
2018-03-08 10:57:27 -05:00
AlanCoding 4a01805a19 add shade back into AWX requirements
Last round of dependency updates showed that AWX
depended on packages which came implicitly from shade
decorator is added as an explicit dependency
and all of the rest of shade requirements are
added back in here.
2018-03-08 10:32:19 -05:00
Michael Abashian c580146c77 Merge branch 'devel' into 169-credentials 2018-03-08 10:03:29 -05:00
mabashian ce3dc40649 Edit schedule credential prompting code cleanup 2018-03-08 09:58:31 -05:00
Shane McDonald 5bf2e00d24 Merge pull request #1471 from shanemcd/devel
Fix container boots on AppArmor protected systems
2018-03-08 09:44:33 -05:00
Shane McDonald 02102f5ba8 Fix container boots on AppArmor protected systems
Link https://github.com/ansible/awx/issues/1297

Signed-off-by: Shane McDonald <me@shanemcd.com>
2018-03-08 09:41:04 -05:00
Shane McDonald 2861397433 Set imagePullPolicy to Always
Not sure why we werent doing this before.
2018-03-08 09:41:04 -05:00
AlanCoding 54a68da088 include stack trace for delete_inventory logs 2018-03-08 08:30:59 -05:00
Alan Rominger 044b85ce7a Merge pull request #1415 from AlanCoding/depgrades
Dependency Upgrades
2018-03-08 08:29:46 -05:00
Michael Abashian b970452950 Merge pull request #1441 from marshmalien/feat/display_invalid_items
Denote invalid job templates and scheduled jobs
2018-03-07 15:26:13 -05:00
adamscmRH f485a04dfc disallow changing token-app 2018-03-07 15:13:56 -05:00
mabashian a5043029c1 Implemented the ability to specify credentials when creating a scheduled job run. Added validation for removing but not replacing default credentials. 2018-03-07 11:57:31 -05:00
Matthew Jones 61a48996ee Merge pull request #1459 from rooftopcellist/update_session_setting
add csrf & session settings
2018-03-07 08:41:17 -08:00
Jake McDermott 8f58d0b998 Merge pull request #1455 from ansible/jakemcdermott-patch-2
auto hide multi credential scrollbar
2018-03-07 11:33:29 -05:00
adamscmRH 0490bca268 add csrf & session settings 2018-03-07 09:32:24 -05:00
Christian Adams 095515bb56 Merge pull request #1458 from rooftopcellist/fix_expiration
Fix expiration
2018-03-07 08:13:25 -05:00
adamscmRH efaa698939 fix token expiration time 2018-03-07 00:42:44 -05:00
AlanCoding 556e6c4a11 Dependency Updates
Upgrades of minor dependency upgrades
Inventory scripts were upgraded in separate commit

Major exclusions from this update
- celery was already downgraded for other reasons
- Django / DRF major update already done, minor bumps here
- asgi-amqp has fixes coming independently, not touched
- TACACS plus added features not needed

Removals of note
- remove shade from AWX requirements
- remove kombu from Ansible requirements

Other notes

Add note about pinning setuptools and pip,
done but not mentioned previously

Stop pinning gevent-websocket and twisted

upgrade Azure to Ansible core requirements

more detailed notes
https://gist.github.com/AlanCoding/9442a512ab6977940bc7b5b346d4f70b

upgrade version of Django for Exception
2018-03-06 16:04:01 -05:00
Matthew Jones 8421d2b0d2 Merge pull request #1457 from matburt/remove_old_migrations
Remove old south migrations from before a previous django upgrade
2018-03-06 12:59:32 -08:00
Jake McDermott f8ca0a613f Update prompt.block.less 2018-03-06 14:56:38 -05:00
Christian Adams db91e30464 Merge pull request #1449 from rooftopcellist/fix_exp_time
fix token expiration time
2018-03-06 14:55:38 -05:00
Matthew Jones d19ef60d97 Remove old south migrations from before a previous django upgrade 2018-03-06 14:47:09 -05:00
Jake McDermott 5971d79a8f auto hide multi credential scrollbar 2018-03-06 14:33:28 -05:00
Wayne Witzel III a3b2f29478 Merge pull request #1454 from wwitzel3/fix-role-summary
Fix role summary when role description is overloaded
2018-03-06 14:03:22 -05:00
adamscmRH a80e3855cd fix token expiration time 2018-03-06 13:22:12 -05:00
Wayne Witzel III 8dce5c826c Fix role summary when role description is overloaded 2018-03-06 13:07:29 -05:00
Demin, Petr f4a241aba2 Constrain requests 2018-03-06 12:47:34 -05:00
Jake McDermott 105b4982c4 Merge pull request #1451 from tburko/devel
Fix "System settings panel form is not rendering #1440"
2018-03-06 11:15:16 -05:00
Alan Rominger cc33109412 Merge pull request #1445 from AlanCoding/platform
Add platform to ec2 group by options
2018-03-06 07:23:22 -05:00
Taras Burko 8a5cd3ec7d Fix "System settings panel form is not rendering #1440" 2018-03-06 14:03:36 +02:00
Ryan Petrello d6af0bfd50 Merge pull request #1448 from ryanpetrello/fix-7923
normalize custom_virtualenv empty values to null
2018-03-05 17:25:51 -05:00
Ryan Petrello 8955e6bc1c normalize custom_virtualenv empty values to null
see: https://github.com/ansible/ansible-tower/issues/7923
2018-03-05 17:05:10 -05:00
Shane McDonald 61087940c5 Merge pull request #1446 from matburt/fix_kubernetes_configmap
Apply celery rollback changes to kubernetes configmap
2018-03-05 16:46:57 -05:00
Matthew Jones e99184656e Apply rabbitmq and setting kubernetes changes post-celery rollback 2018-03-05 16:22:27 -05:00
AlanCoding 341e2c0fe2 add platform to ec2 group by options 2018-03-05 15:43:28 -05:00
Matthew Jones 105b82c436 Apply celery rollback changes to kubernetes configmap 2018-03-05 15:32:24 -05:00
Ryan Petrello 1596b2907b Merge pull request #1439 from ryanpetrello/fix-7923
add validation to InventorySource.inventory to avoid task manager death
2018-03-05 15:12:24 -05:00
Marliana Lara 18f3c79bc3 Denote invalid job templates and scheduled jobs by displaying a red invalid bar 2018-03-05 14:52:40 -05:00
Ryan Petrello 8887be5952 add validation to InventorySource.inventory to avoid task manager death
see: https://github.com/ansible/awx/issues/1438
2018-03-05 14:40:57 -05:00
Shane McDonald 44f6423af3 Merge pull request #1442 from ryanpetrello/devel
fix busted shippable builds
2018-03-05 14:38:35 -05:00
Chris Meyers 80a970288d Merge pull request #1443 from chrismeyersfsu/fix-named_urls
handle 404 returned by resolve()
2018-03-05 14:37:07 -05:00
chris meyers ccfb6d64bf handle 404 returned by resolve()
* related to https://github.com/ansible/ansible-tower/issues/7926
* if 404 on url in migration loading middelware, do NOT short circuit
middleware. Simply call the normal middlware code path in this case.
2018-03-05 14:34:53 -05:00
Ryan Petrello 13672cc88c fix busted shippable builds 2018-03-05 14:16:42 -05:00
Shane McDonald d5773c58d3 Merge pull request #1426 from chrismeyersfsu/fix-migration_in_progress
short-circuit middleware if migration loading url
2018-03-03 10:48:50 -05:00
Jake McDermott 5370c5e07d Merge pull request #1431 from wenottingham/check-check-check-it-out
Adjust some wording in the UI.
2018-03-02 21:07:18 -05:00
Bill Nottingham 1606380f61 Adjust some wording in the UI.
Attempt to make the 'scm update' vs 'scm checkout' more clear.
Remove 'future' from scheduling tooltips (superfluous).
2018-03-02 19:54:02 -05:00