External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-13 07:54:42 -03:30
Code Issues Packages Projects Releases Wiki Activity
16,381 Commits 56 Branches 102 Tags
7b2b71e3ef740bc277a75b0d40a4f2f78d51e807
Commit Graph

13278 Commits

Author SHA1 Message Date
Bill Nottingham
7b2b71e3ef ... update string in tests as well. 2018-03-09 17:49:46 -05:00
Bill Nottingham
fb05eecee0 Add some periods. 2018-03-09 17:23:52 -05:00
Ryan Petrello
397b9071a6 properly categorize OAuth2 endpoints for swagger autogen 2018-03-09 15:07:50 -05:00
Marliana Lara
bfbbb95256 Merge pull request #1475 from marshmalien/feat/style_upgrade_page 
Style migrations-pending page
 2018-03-09 11:47:34 -05:00
Marliana Lara
882ed4d05a Merge pull request #1497 from marshmalien/feat/display_invalid_items_onPrompt 
Denote invalid template when no inventory and no prompt-for-inventory
 2018-03-09 10:38:20 -05:00
Christian Adams
cee12c4e6c Merge pull request #1378 from rooftopcellist/no_patch_app 
disallow changing token-app
 2018-03-09 10:33:24 -05:00
Marliana Lara
c2a3e82d29 Check Inventory ask_inventory_on_launch value when verifying template validity 2018-03-09 10:08:39 -05:00
chris meyers
e2ed1542e6 more celery rollback 
* Setting reload code calls a celery 4.x method signature. This changes
it back to a 3.x safe call.
 2018-03-09 09:27:09 -05:00
Christian Adams
8a25342ce5 Merge pull request #1373 from rooftopcellist/oauth_doc_csrf 
update docs
 2018-03-08 18:15:04 -05:00
Alan Rominger
b41d9c4620 Merge pull request #1470 from AlanCoding/mo_exceptions 
Include stack trace for delete_inventory logs
 2018-03-08 17:18:40 -05:00
adamscmRH
91c0f2da6f simplifies detail serializer 2018-03-08 14:55:25 -05:00
Matthew Jones
b11b1acc68 Update middleware warning for latest minor version 2018-03-08 12:54:26 -05:00
adamscmRH
9b195bc80f fix oauth docs 2018-03-08 12:44:53 -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
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
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
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
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
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
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
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
AlanCoding
341e2c0fe2 add platform to ec2 group by options 2018-03-05 15:43:28 -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
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
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
Christian Adams
953850a0d7 Merge pull request #1427 from rooftopcellist/hide_client_secret 
Hide client_secret from activity stream
 2018-03-02 15:43:49 -05:00
adamscmRH
701a5c9a36 hides client_secret from act stream 2018-03-02 14:47:49 -05:00
chris meyers
36d59651af inherit rather than monkey patch 
* Enable migration in progress page in ALL environments
 2018-03-02 12:37:48 -05:00
Christian Adams
d1319b7394 Merge pull request #1414 from rooftopcellist/testing_oauth 
fix token creation at `api/o/token`
 2018-03-02 11:36:59 -05:00
chris meyers
746a2c1eea short-circuit middleware if migration loading url 
* Had to monkey patch django middleware logic.
* Left checks to tell coders to use new middleware behavior in favor of
monkey patching.
 2018-03-02 11:21:26 -05:00
Chris Meyers
9df76f963b Merge pull request #1412 from chrismeyersfsu/reap_new_nodes_too 
reap all nodes that havn't checked in
 2018-03-02 10:03:37 -05:00