External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-14 11:20:39 -03:30
Code Issues Packages Projects Releases Wiki Activity
23,774 Commits 54 Branches 19 Tags
Commit Graph

23774 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jake Jackson
caad204cbb Merge branch 'devel' of github.com:ansible/awx into fix_collection_sanity 2019-12-18 09:52:24 -05:00
softwarefactory-project-zuul[bot]
05e2386fac
Merge pull request #5531 from ghjm/login_redirect_null_issue 
Set a default value for LOGIN_REDIRECT_URL

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-12-17 20:20:29 +00:00
Graham Mainwaring
3c0fd37a4d Set a default value for LOGIN_REDIRECT_URL 2019-12-17 14:39:35 -05:00
softwarefactory-project-zuul[bot]
b23ccf7ee1
Merge pull request #5529 from shanemcd/set_default_var 
Set default value for create_preload_data in image_build role

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-12-17 19:18:50 +00:00
Shane McDonald
bd8643d599
Set default value for create_preload_data in image_build role 
This caused our AWX release workflow to blow up
 2019-12-17 13:40:37 -05:00
Shane McDonald
b23856f126
Bump VERSION to 9.1.0 2019-12-17 11:38:32 -05:00
softwarefactory-project-zuul[bot]
c062728359
Merge pull request #5512 from jakemcdermott/ui-next-fix-template-tab-unload 
Don't reload template panel on tab change

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-12-17 00:16:25 +00:00
softwarefactory-project-zuul[bot]
85d185cc8b
Merge pull request #5505 from jakemcdermott/fix-5485 
Use job details status to test status

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-12-16 23:45:45 +00:00
softwarefactory-project-zuul[bot]
77b8f345ae
Merge pull request #5511 from jakemcdermott/ui-next-fix-inv-list-select-all-state 
Initialize inventory list with none selected

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-12-16 23:14:37 +00:00
softwarefactory-project-zuul[bot]
0052967aee
Merge pull request #5489 from fosterseth/fix-proj-update-blocking 
Remove project update blocking

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-12-16 19:51:51 +00:00
Seth Foster
63e9aed601
Prevent running jobs from blocking project updates 
A running job that has a project update will block
that update from running. This fix removes
the block.
Adds a functional test that sets up a job in "running" state, and
starts a project update that is in "pending" state. Assert that
the task manager and dependency graph .is_job_blocked methods both
return False.

issue #5153
 2019-12-16 13:43:42 -05:00
softwarefactory-project-zuul[bot]
d4be8c8168
Merge pull request #5516 from shanemcd/downstream-changes 
A few downstream changes

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-12-16 17:49:03 +00:00
softwarefactory-project-zuul[bot]
cdf4b0d1ed
Merge pull request #5510 from jakemcdermott/ui-next-fix-user-link-in 
Fix access list and navigation user link-ins

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-12-16 17:48:58 +00:00
softwarefactory-project-zuul[bot]
c43a59e475
Merge pull request #5391 from wenottingham/really-we-would-remove-the-drummer-before-slash 
Don't error on a trailing slash, just fix it up

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-12-16 17:19:34 +00:00
Jake McDermott
014520ee2b
Initialize list with none selected 2019-12-16 11:46:53 -05:00
Shane McDonald
c1abc56753
Merge remote-tracking branch 'downstream/release_3.6.2' into downstream-changes 2019-12-16 11:13:10 -05:00
softwarefactory-project-zuul[bot]
c5b4681bf4
Merge pull request #5491 from marshmalien/inv-host-add 
Add Inventory Host Add form 

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-12-16 16:06:24 +00:00
softwarefactory-project-zuul[bot]
00b7d6571a
Merge pull request #5509 from jakemcdermott/ui-next-webpack-4.41.2 
Update webpack to 4.41.2

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-12-16 15:55:29 +00:00
Jake McDermott
9ed2534ac5
Don't reload panel on tab change 2019-12-16 09:25:12 -05:00
Jake McDermott
a3bc3986bb
Fix resource access list user links 2019-12-16 08:51:10 -05:00
Jake McDermott
230933744c
Fix nav user links 2019-12-16 08:50:59 -05:00
Jake McDermott
227a90006e
Update webpack to 4.41.2 2019-12-16 08:36:24 -05:00
softwarefactory-project-zuul[bot]
112f89660b
Merge pull request #5239 from AlanCoding/migration_cache 
Reduce API response times by 30% by using memcache migration flag

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-12-16 04:33:29 +00:00
AlanCoding
a0910eb6de
Apply migration flag check to task manager 2019-12-15 22:56:57 -05:00
AlanCoding
5433af6716
Reduce API response times by caching migration flag 2019-12-15 22:56:57 -05:00
Jake McDermott
9744b89737
Use job details status to test status 2019-12-13 17:32:23 -05:00
softwarefactory-project-zuul[bot]
04c535e3f9
Merge pull request #5424 from AlexSCorey/InventoryGroupAdd/Edit 
Adds Inventory Groups

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-12-13 22:23:14 +00:00
Alex Corey
259e53f59d Fixes failing zuul test 2019-12-13 16:38:59 -05:00
Bill Nottingham
ac9bf1afcf Don't error on a trailing slash, just fix it up 2019-12-13 15:59:40 -05:00
Alex Corey
4b62d77015 Moves inventoryGroupForm into shared directory 
Updates InventoryGroups tests
Adds ContentError functionalist to catch a case where a use might navigate to an Inventory
that isn't associated to the shown inventoryGroup.
 2019-12-13 14:20:56 -05:00
Alex Corey
ef5ce0b082 Flattens Inventory File Structure Remove 2019-12-13 14:20:56 -05:00
Alex Corey
1942be7dc3 Checks for modified and create in Inv Group Deets 
Also includes refactoring for css over style prop and removed some
unnecessary loading checks
 2019-12-13 14:20:56 -05:00
Alex Corey
210f9577b0 Fixed filename typo 2019-12-13 14:20:56 -05:00
Alex Corey
87a05a5b2e Testing Improvements and Refactoring 2019-12-13 14:20:56 -05:00
Alex Corey
f8a754cf44 Adds Alert Modal, Breadcrumb, Nested Tabs and Refactors PR. 2019-12-13 14:20:56 -05:00
Alex Corey
3ea37e1c79 Addresses PR issues 
Adds Delete Modal for deleting from Details view
Adds test for delete modal
Addresses styling for Variables label
Removes X close button from form
 2019-12-13 14:20:56 -05:00
Alex Corey
c997fcfc2c Adds Inventory Groups routing --sort of 
Adds Inventory Groups Add
Adds Inventory Groups Edit
Adds Inventory Groups Form
Adds api module for Groups
Adds placeholder file for InventoryGroupsList.  This was added to refine routing.  Tgere are no tests for this file yet.
 2019-12-13 14:20:56 -05:00
softwarefactory-project-zuul[bot]
4dd4928aab
Merge pull request #5495 from shanemcd/less-is-more-secure 
Remove some unused stuff from k8s secret

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-12-13 14:06:50 +00:00
softwarefactory-project-zuul[bot]
5aeaabaceb
Merge pull request #5438 from jainnikhil30/devel 
adding instance consumed and remaining capacity to metrics

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-12-13 08:27:38 +00:00
Nikhil Jain
0d4e6d7e0b do the sum once and store it in a variable which will be reused 2019-12-13 13:21:49 +05:30
Nikhil Jain
9ae038868c adding instance consumed and remaining capacity to metrics 2019-12-13 13:21:49 +05:30
Shane McDonald
0b4ae74698
Remove some unused stuff from k8s secret 2019-12-12 19:36:56 -05:00
softwarefactory-project-zuul[bot]
0d248a12bc
Merge pull request #5493 from ryanpetrello/rekey-command 
add an awx-manage command for re-generating SECRET_KEY

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-12-12 22:07:23 +00:00
Ryan Petrello
7396e2e7ac
add an awx-manage command for re-generating SECRET_KEY 2019-12-12 16:19:20 -05:00
Ryan Petrello
cac3bece56
Merge pull request #4032 from ghjm/configurable_login_3.6.2 
[3.6.2] Configurable login redirect
 2019-12-12 15:43:58 -05:00
Ryan Petrello
e4145b580c
fix a flake8 nit 2019-12-12 15:43:23 -05:00
Ryan Petrello
74076b99d6
Merge pull request #3998 from ryanpetrello/rekey-secret-key 
[3.6.2] add an awx-manage command for re-generating SECRET_KEY
 2019-12-12 15:25:15 -05:00
Marliana Lara
5d35506b0c
Add Inventory Host Add form 2019-12-12 13:58:22 -05:00
softwarefactory-project-zuul[bot]
e646b46a2c
Merge pull request #5479 from ghjm/configurable_login 
Configurable login redirect

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-12-12 14:50:19 +00:00
mabashian
475e2605d4 Changes redirect logic slightly to lean on a global var to store the config response rather than a constant on the awApp module. This should allow us to avoid test changes. 2019-12-11 21:12:38 -05:00