1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 16:51:11 +03:00
Commit Graph

23042 Commits

Author SHA1 Message Date
Christian Adams
19a6c70858 remove cruft leftover from the postgresql upgrade 2019-10-03 14:43:56 -04:00
softwarefactory-project-zuul[bot]
393474f33d
Merge pull request #4701 from AlanCoding/awx_modules_merge
Migrate Ansible tower modules to collection maintained alongside AWX

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2019-10-03 18:25:55 +00:00
softwarefactory-project-zuul[bot]
b41e6394c5
Merge pull request #4898 from mabashian/upgrade-handlebars-uglify
Bumps handlebars and uglify-js deps

Reviewed-by: Michael Abashian
             https://github.com/mabashian
2019-10-03 17:35:24 +00:00
Christian Adams
f36f10a702 add RefreshToken Expiration setting in UI 2019-10-03 13:13:31 -04:00
Ryan Petrello
fccd6a2286
attempt to properly map more foreign keys to named lookups
this is imperfect, but it's at least an improvement until we can come up
with a better solution

in order to really do this right, the API itself probably needs to grow
some more metadata that allows us to specify *actual* `type`s that
relate to API resources

see: https://github.com/ansible/awx/issues/4874
2019-10-03 12:59:06 -04:00
mabashian
ea2312259f Bumps handlebars and uglify-js deps 2019-10-03 12:54:56 -04:00
softwarefactory-project-zuul[bot]
0e2b7767f5
Merge pull request #4900 from mabashian/fix-snapshot
Fix broken notif list snapshot

Reviewed-by: awxbot
             https://github.com/awxbot
2019-10-03 16:52:56 +00:00
mabashian
82505cd43a Fix broken notif list snapshot 2019-10-03 12:19:50 -04:00
softwarefactory-project-zuul[bot]
5b17ce5729
Merge pull request #4886 from fosterseth/fix-4710-clearexpiredtokens
Set oauth2 refresh token expiration setting

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2019-10-03 16:19:10 +00:00
softwarefactory-project-zuul[bot]
82b313c767
Merge pull request #4871 from rooftopcellist/check_db
Add awx-manage command to check db connection

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2019-10-03 15:16:32 +00:00
softwarefactory-project-zuul[bot]
fec67a3545
Merge pull request #4888 from ryanpetrello/cli-send-receive-note
cli: add a note about send/receive

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2019-10-03 14:17:08 +00:00
softwarefactory-project-zuul[bot]
202af079eb
Merge pull request #4849 from mabashian/3779-license-error
Show error body when license application fails

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2019-10-03 12:57:23 +00:00
softwarefactory-project-zuul[bot]
f78d7637a4
Merge pull request #4853 from mabashian/4778-workflow-text-overlap
Prevent text overlap on workflow nodes when an approval node is deleted

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2019-10-03 12:48:56 +00:00
softwarefactory-project-zuul[bot]
71bd257191
Merge pull request #4875 from keithjgrant/4684-jt-form-cleanup
Job Template form cleanup

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2019-10-02 22:24:57 +00:00
Keith Grant
82064eb4dc fix prop type error in LabelSelect 2019-10-02 14:17:14 -07:00
Seth Foster
bbd625f3aa
update help_text to include information about REFRESH_TOKEN_EXPIRE_SECONDS 2019-10-02 17:16:01 -04:00
softwarefactory-project-zuul[bot]
3725ccb43b
Merge pull request #4865 from mabashian/3607-settings
Fix settings page rendering when some fields are set manually in file

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2019-10-02 19:43:18 +00:00
Seth Foster
8b22c86b10
Register default settings for OAUTH2_PROVIDER app
Grab AUTHORIZATION_CODE_EXPIRE_SECONDS from oauth2_settings
rather than hard code.

Add REFRESH_TOKEN_EXPIRE_SECONDS to valid_key_names
in OAuth2ProviderField class
2019-10-02 15:29:45 -04:00
softwarefactory-project-zuul[bot]
e6a5d18ebe
Merge pull request #4885 from wenottingham/minor-typo
Apply some minor copy edits to awx docs

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2019-10-02 18:35:32 +00:00
softwarefactory-project-zuul[bot]
eca191f7f5
Merge pull request #4839 from rebeccahhh/devel
added in ability to delete a user if they are part of your organization

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2019-10-02 18:35:27 +00:00
Ryan Petrello
35fe127891
cli: add a note about send/receive 2019-10-02 14:06:56 -04:00
Seth Foster
db1ad2de95
Set REFRESH_TOKEN_EXPIRE_SECONDS
- Set OAUTH2 REFRESH_TOKEN_EXPIRE_SECONDS to 1 month
  (2628000 seconds)
- If not set, awx-manage cleartokens, or cleanup_tokens,
  will not work properly
- Once cleartokens is run, this setting is the amount of
  time after an access token expires that we keep its
  refresh token in the database
2019-10-02 13:51:46 -04:00
Bill Nottingham
ac12a9cfe1 Apply some minor copy edits 2019-10-02 13:46:10 -04:00
softwarefactory-project-zuul[bot]
dacda644ac
Merge pull request #4882 from jbradberry/isolated-playbooks-with-spaces
Quote the playbook passed to runner from the isolated manager

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2019-10-02 17:40:20 +00:00
softwarefactory-project-zuul[bot]
cfa407e001
Merge pull request #4843 from lunarthegrey/patch-1
Fix issue #3705

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2019-10-02 17:38:13 +00:00
softwarefactory-project-zuul[bot]
329630ce2a
Merge pull request #4869 from mabashian/4192-enter-textarea
Unbind keydown listeners when Alert modals are closed.

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2019-10-02 15:11:21 +00:00
Jeff Bradberry
1122d28a1b Quote the playbook passed to runner from the isolated manager 2019-10-02 11:10:19 -04:00
softwarefactory-project-zuul[bot]
a9b299cd98
Merge pull request #4881 from ryanpetrello/cli-ssh-example
cli: warn users if they specify a missing file with @

Reviewed-by: Yanis Guenane
             https://github.com/Spredzy
2019-10-02 15:00:51 +00:00
Ryan Petrello
6c1488ed00
cli: warn users if they specify a missing file with @ 2019-10-02 10:28:04 -04:00
softwarefactory-project-zuul[bot]
1f62d223a2
Merge pull request #4880 from ryanpetrello/cli-install-rst
template CLI install documentation into a separate file

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2019-10-02 14:04:05 +00:00
Ryan Petrello
da23c4e949
template CLI install documentation into a separate file 2019-10-02 09:41:11 -04:00
Keith Grant
6d00d43273 prettier 2019-10-01 15:20:51 -07:00
Keith Grant
77b68e0eb7 use getAddedAndRemoved for saving instance groups 2019-10-01 14:37:42 -07:00
softwarefactory-project-zuul[bot]
945d100302
Merge pull request #4836 from fosterseth/fix-4334-active-user-removed
check if User exists before saving UserSessionMembership

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2019-10-01 19:59:11 +00:00
Christian Adams
c0fd70f189 add mgmt cmd to check db connection 2019-10-01 15:40:43 -04:00
Keith Grant
ba4e79fd3a update JT form tests 2019-10-01 11:03:36 -07:00
AlanCoding
db0bd471c3
rename playbook vars to have collection_ 2019-10-01 13:45:07 -04:00
mabashian
616fe285fa Unbind keydown listeners when Alert modals are closed.
This fixes a bug where attempting to hit enter in any sort of textarea would be ignored if the user had previously encountered an Alert modal while navigating throughout the application.
2019-10-01 12:38:43 -04:00
Jake McDermott
b4b2cf76f6
Refactor job secondary label assignment 2019-10-01 10:33:47 -04:00
mabashian
4aeda635ff Checks to make sure that OAUTH2_PROVIDER key is returned by api in settings options before attempting to use it. This fixes a bug where setting ACCESS_TOKEN_EXPIRE_SECONDS and AUTHORIZATION_CODE_EXPIRE_SECONDS manually in a file was causing the settings page to render improperly. 2019-10-01 10:17:33 -04:00
softwarefactory-project-zuul[bot]
7e8c00ee24
Merge pull request #4864 from ryanpetrello/dont-stop-the-beat
warn loudly if celerybeat encounters AMQP connection issues

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2019-10-01 13:56:54 +00:00
Ryan Petrello
27c4e35ee4
warn loudly if celerybeat encounters AMQP connection issues
related: https://github.com/ansible/awx/pull/4857
2019-10-01 09:32:22 -04:00
softwarefactory-project-zuul[bot]
80a17987ff
Merge pull request #4854 from ryanpetrello/cli-login-formatting
cli: make `awx login` respect the -f flag

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2019-10-01 01:14:15 +00:00
softwarefactory-project-zuul[bot]
10a6a29a07
Merge pull request #4857 from ryanpetrello/kombu-dns
make kombu DNS failures louder in the logs

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
2019-09-30 21:35:29 +00:00
Ryan Petrello
b80eafe4a1
make kombu DNS failures louder in the logs 2019-09-30 16:48:09 -04:00
Alex Corey
6c443a0a6a fix lint error 2019-09-30 16:38:51 -04:00
Alex Corey
55378c635e Makes template list responive 2019-09-30 16:28:24 -04:00
Ryan Petrello
a4047e414f
cli: make awx login respect the -f flag
see: https://groups.google.com/forum/?utm_medium=email&utm_source=footer#!msg/awx-project/ZAlhpLMBzVw/fUSqujoWBQAJ
2019-09-30 15:38:08 -04:00
Jeff Bradberry
d549877ebd Check for the existance of a UnifiedJobTemplate with the same webhook GUID
instead of trying (incorrectly) to be specific about the JT/WFJT type.
2019-09-30 15:26:49 -04:00
Rebeccah
28a119ca96 re-worked unit test into 3 seperate unit tests, one for orphans, one for group members, and one for multi-group members 2019-09-30 15:07:19 -04:00