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

23680 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
7ceaa9ec4a 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 17:21:02 -05:00
mabashian
4b3d3537b4 Fix linting error (unused var) 2019-12-11 17:21:02 -05:00
mabashian
efbff24528 Adds trailing slash to /api request 2019-12-11 17:21:02 -05:00
mabashian
1d9ce6cc15 Moves config request out to block of code that gets executed before the app is bootstrapped. This should allow us to redirect to the override url before the app begins to render, improving the UX. 2019-12-11 17:21:02 -05:00
mabashian
794ce96b17 Reverts changes to logout logic. We don't want to redirect to an override url if the user explicitly logs out. 2019-12-11 17:21:02 -05:00
mabashian
181421a2ee Adds logic to redirect unauthenticated user if LOGIN_REDIRECT_OVERRIDE is set as long as the user is not navigating to /login or /#/login. Also redirects on logout if LOGIN_REDIRECT_OVERRIDE is set. 2019-12-11 17:21:02 -05:00
Graham Mainwaring
9c9496a683 Expose login redirect URL in unauthenticated /api view 2019-12-11 17:21:02 -05:00
Graham Mainwaring
2b111c81df Add /login convenience URL 2019-12-11 17:21:02 -05:00
mabashian
f467e26842 Adds login redirect override field to the System (Misc System) Settings interface 2019-12-11 17:21:02 -05:00
Graham Mainwaring
7700050d10 Add default for LOGIN_REDIRECT_OVERRIDE 2019-12-11 17:21:02 -05:00
Graham Mainwaring
a8d34b46fb Add setting for configurable login redirect URL 2019-12-11 17:21:02 -05:00
softwarefactory-project-zuul[bot]
6fab3590ae
Merge pull request #5408 from keithjgrant/5065-lookup-c 
Lookup refactor

Reviewed-by: Jake McDermott <yo@jakemcdermott.me>
             https://github.com/jakemcdermott
 2019-12-10 22:01:50 +00:00
Keith Grant
846fd67618 de-lint 2019-12-10 12:13:22 -08:00
Keith Grant
3409d39150 fix ProjectLookup re-renders 2019-12-10 11:09:11 -08:00
Keith Grant
9de165a676 revert MultiCredentialLookup loading jank fix 2019-12-10 11:09:11 -08:00
Keith Grant
f54616912d de-lint 2019-12-10 11:09:11 -08:00
Keith Grant
c003e89ea9 fix loading jank in MultiCredentialLookup 2019-12-10 11:09:11 -08:00
Keith Grant
6e64b5c070 clean up act() errors in form tests after Lookup changes 2019-12-10 11:09:11 -08:00
softwarefactory-project-zuul[bot]
fcfc34fef1
Merge pull request #5413 from beeankha/custom_email_approve_deny_fix 
Enable Approval-Related Email Notifications to Send Properly

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-12-10 19:04:41 +00:00
Keith Grant
75b7d74f91 Lookup tweaks/bug fixes 2019-12-10 10:58:33 -08:00
Keith Grant
569b5bc533 clean up multiple test 'act()' warnings 2019-12-10 10:58:33 -08:00
Keith Grant
9ab9c6961b update Lookup tests, add OptionsList tests 2019-12-10 10:58:33 -08:00
Keith Grant
2e525f8922 update tests for CredentialLookup, OrgLookup, ProjectLookup 2019-12-10 10:58:33 -08:00
Keith Grant
9c6300c2de update MultiCredentialsLookup tests 2019-12-10 10:58:33 -08:00
Keith Grant
f8153393b1 fix minor lookup bugs 2019-12-10 10:58:33 -08:00
Keith Grant
cb07e9c757 convert all lookups to use new Lookup component 2019-12-10 10:58:33 -08:00
Keith Grant
639b297027 fix credential chips in SelectedList, MultiCredential cleanup 2019-12-10 10:58:32 -08:00
Keith Grant
4341d67fb0 add MultiCredentialsLookup select/deselect logic 2019-12-10 10:58:32 -08:00
Keith Grant
6260633974 flushing out new approach to MultiCredentialsLookup 2019-12-10 10:58:32 -08:00
Keith Grant
8ec856f3b6 start Lookup reducer 2019-12-10 10:58:32 -08:00
Keith Grant
5a207f155e WIP split Lookup into Lookup & CategoryLookup 2019-12-10 10:58:32 -08:00
Alex Corey
2a722ba8d0 Refactors Lookup 2019-12-10 10:58:32 -08:00
softwarefactory-project-zuul[bot]
efbd2177a5
Merge pull request #5449 from marshmalien/inv-groups-list 
Add Inventory Groups and Groups Delete Modal

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-12-10 18:12:47 +00:00
softwarefactory-project-zuul[bot]
989e1ca5d6
Merge pull request #5477 from ryanpetrello/oauth-500 
provide better HTTP responses for certain OAuth2 error scenarios

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-12-10 17:41:12 +00:00
Marliana Lara
4c89568d71
Apply radio selection to ALL selected groups in modal 
* Use semantic html to describe modal list
* Move nested try/catch block
* Remove deprecated type fields
* If delete fails, keep selected list checked
 2019-12-10 12:29:33 -05:00
softwarefactory-project-zuul[bot]
a9688ac805
Merge pull request #5471 from mabashian/5349-upgrade-angular-scheduler 
Pull in latest version of our angular-scheduler fork to fix Tueday/Tuesday typo

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-12-10 17:25:35 +00:00
Ryan Petrello
12a8793ddb
provide a better error for OAuth2 logins for external accounts 
attempting to use an OAuth2 token as an externally authenticated user throws an HTTP 500 error when external oauth is disabled - this change improves that so it's a 401 Unauthorized instead.
 2019-12-10 11:52:25 -05:00
softwarefactory-project-zuul[bot]
7bbf640389
Merge pull request #5450 from beeankha/tower_job_template_extra_vars 
Add extra_vars Parameter to tower_job_template.py Module

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-12-10 16:32:24 +00:00
softwarefactory-project-zuul[bot]
cb6688c685
Merge pull request #5412 from appuk/apurva-new-ids 
Add dataCy attribute

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-12-09 20:22:08 +00:00
softwarefactory-project-zuul[bot]
c29afce54d
Merge pull request #5472 from AlanCoding/ryan_hosts 
Use total_hosts for task impact for performance

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-12-09 18:07:58 +00:00
Apurva Bakshi
eddee456b3 Add dataCy attribute to select-user-role and select-team-role buttons 2019-12-09 12:16:27 -05:00
softwarefactory-project-zuul[bot]
e131e8c151
Merge pull request #5466 from jakemcdermott/hooks-organization-add 
Migrate organization add to functional component

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-12-09 16:07:50 +00:00
softwarefactory-project-zuul[bot]
d30ecaa7e3
Merge pull request #5468 from Spredzy/playbook_modern_syntax 
ansible playbook: move to modern syntax

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-12-09 16:07:46 +00:00
AlanCoding
dfc4a0c0e0
Compute fields in smart task_impact tests 2019-12-09 10:59:59 -05:00