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

28165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Bradberry
a3723db357 Do not drop inventories marked as has_inventory_sources 2021-01-08 14:32:33 -05:00
softwarefactory-project-zuul[bot]
aa87a99441
Merge pull request #9044 from kdelee/awx_silent_delete_conflict 
silent_delete also needs to handle Confict

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2021-01-08 16:25:54 +00:00
Elijah DeLee
a157a3598f silent_delete also needs to handle Confict 2021-01-08 10:55:55 -05:00
softwarefactory-project-zuul[bot]
1dec79b62d
Merge pull request #8880 from vguillard/issue_5080_openstack_region_field_missing 
Related #5080 openstack region field missing

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2021-01-08 14:39:03 +00:00
softwarefactory-project-zuul[bot]
98b25f619e
Merge pull request #9040 from kdelee/new_teardown_error 
When deleting a job sometimes we get this error

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2021-01-07 22:38:29 +00:00
Elijah DeLee
908291dd3c When deleting a job sometimes we get this error 
For the silent delete method, we should let this one slide
because it is an expected error that may occur if there are still
events processing.
 2021-01-07 15:37:57 -05:00
softwarefactory-project-zuul[bot]
764511f33f
Merge pull request #8738 from AlexSCorey/8532-VaultIdsOnCredChips 
Adds vault IDs to Vault credential chips

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2021-01-07 19:49:13 +00:00
softwarefactory-project-zuul[bot]
b0c3c2b16a
Merge pull request #8654 from mabashian/8530-data-list-toolbar-ids 
Swap underscores for hyphens in qs namespace strings

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2021-01-07 19:12:44 +00:00
mabashian
dcd79cdb98 Swap underscores for hyphens in qs namespace strings 2021-01-07 13:19:05 -05:00
softwarefactory-project-zuul[bot]
e1fb6542c3
Merge pull request #9002 from nixocio/ui_update_dep 
Update dependencies

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2021-01-07 16:43:51 +00:00
Alex Corey
9cc3579189 Adds vault IDs to Vault credential chips 2021-01-07 11:39:57 -05:00
softwarefactory-project-zuul[bot]
c8594edc0b
Merge pull request #9009 from chrismeyersfsu/purge_devel_settings 
consolidate settings and delete dead settings

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2021-01-07 15:56:11 +00:00
nixocio
a1b0fa252a Update dependencies 
Update dependencies
 2021-01-07 09:06:43 -05:00
softwarefactory-project-zuul[bot]
e640bde42c
Merge pull request #9003 from AlexSCorey/8847-fix 
Adds sync button to project details page

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2021-01-06 22:39:26 +00:00
Alex Corey
d1fcb96ee2 Adds sync button to project details page 2021-01-06 15:47:11 -05:00
softwarefactory-project-zuul[bot]
b6f032bf88
Merge pull request #8762 from marshmalien/setting-google-oauth2-edit-form 
Add Google OAuth 2.0 setting edit form

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2021-01-06 19:48:11 +00:00
softwarefactory-project-zuul[bot]
8e104417a6
Merge pull request #9008 from jbradberry/autobahn-cve 
Update autobahn to address CVE-2020-35678

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2021-01-06 18:14:22 +00:00
softwarefactory-project-zuul[bot]
148e4ef10c
Merge pull request #9017 from rh-dluong/fix-timeout-description 
Changed task to job in job timeout description, fixes #9016

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2021-01-06 15:31:19 +00:00
dluong
3e8eb7f23e Changed task to job in job timeout description, fixes #9016 2021-01-06 09:52:48 -05:00
Jeff Bradberry
0eff06318f Update autobahn to address CVE-2020-35678 2021-01-05 13:44:05 -05:00
Chris Meyers
ad621a7da2 consolidate settings and delete dead settings 2021-01-05 13:02:25 -05:00
softwarefactory-project-zuul[bot]
96a7fe0035
Merge pull request #9005 from AlanCoding/assert_workflow_failure 
Make workflow_job.assert_successful() give specifics

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2021-01-05 17:28:28 +00:00
softwarefactory-project-zuul[bot]
545119fb56
Merge pull request #9006 from ryanpetrello/pin-pip-tools-updater 
pin pip-tools for now

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2021-01-05 16:15:11 +00:00
Ryan Petrello
f40ee7ca15
pin pip-tools for now 
a new version of pip-tools changed the format of dependency annotations
in generated requirements.txt files

we should probably change to the new format at some point, but maybe
*after* we merge a few of our long-running branches that touch these
files (otherwise, managing conflicts could be pretty hellish)
 2021-01-05 10:45:40 -05:00
softwarefactory-project-zuul[bot]
c6e61395f5
Merge pull request #9001 from chrismeyersfsu/fix-iso_manager_log 
specify isolated_manager.log path

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2021-01-05 15:41:06 +00:00
Alan Rominger
d3c51ce75d
Minor organization clarity for workflow failure summary 2021-01-05 10:33:35 -05:00
Alan Rominger
9a16e9f787
Condense logic for handling null job 2021-01-05 10:26:38 -05:00
Alan Rominger
d79b96b6cc
Make workflow_job.assert_successful() give specifics 2021-01-05 10:15:32 -05:00
softwarefactory-project-zuul[bot]
b667162496
Merge pull request #8892 from AlexSCorey/8603-fix 
Adds searchable keys and related keys to Credentials list

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2021-01-05 15:14:43 +00:00
softwarefactory-project-zuul[bot]
72cab99cd7
Merge pull request #9000 from nixocio/ui_fix_contrib_docs 
Small docs update

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2021-01-05 14:56:09 +00:00
Chris Meyers
474252dbff specify isolated_manager.log path 
* By default, log files are created in the dir relative to the awx
source. For production, explicitly specify the log file path
 2021-01-05 09:22:56 -05:00
nixocio
45e9bdcf86 Small docs update 
Small docs update. Fix broken link, and update node version used.

See: https://github.com/ansible/awx/pull/8766/files
 2021-01-05 09:16:44 -05:00
softwarefactory-project-zuul[bot]
f52b23f298
Merge pull request #8658 from mabashian/5683-created-modified-details 
Move jt/wfjt created/modified details to the end right before the full width details

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2021-01-04 22:49:40 +00:00
mabashian
0b3d9b026d Adds created/modified details to several areas 2021-01-04 16:17:46 -05:00
Alex Corey
1dbadca78e Adds searchable keys and related keys 2021-01-04 15:35:54 -05:00
softwarefactory-project-zuul[bot]
13861dee85
Merge pull request #8836 from chrismeyersfsu/sustaining-improve_iso_logging_devel 
Sustaining improve iso logging devel

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2021-01-04 20:18:24 +00:00
mabashian
4ea757c91a Move jt/wfjt created/modified details to the end right before the full width details 2021-01-04 15:04:34 -05:00
softwarefactory-project-zuul[bot]
7e74f823f4
Merge pull request #8996 from robled/license_module_docs_fix 
Fixed link to Content Hub in Tower module documentation

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2021-01-04 16:54:15 +00:00
David Roble
e611a67be7 Fixed link to Content Hub in Tower module documentation 
Signed-off-by: David Roble <droble@redhat.com>
 2021-01-04 11:21:30 -05:00
softwarefactory-project-zuul[bot]
a98dfc978e
Merge pull request #8980 from shanemcd/simplify-image-build 
Simplify image build

Reviewed-by: Alan Rominger <arominge@redhat.com>
             https://github.com/AlanCoding
 2021-01-04 15:47:58 +00:00
Shane McDonald
642e6f792c Remove unnecessary conditional from image build task 2020-12-29 19:14:16 -05:00
Shane McDonald
b857fb5074 Remove use_container_for_build from inventory 2020-12-29 19:14:05 -05:00
Shane McDonald
6f9862c72e Sweeping replace of old dev venv paths 2020-12-26 21:29:22 -05:00
Shane McDonald
1033c4d251 Explicitly run image_build and image_push on localhost 2020-12-26 13:16:42 -05:00
Shane McDonald
ab6430e50d Dramatically simplify image_build role 
This does a few things:

- Removes need for awx_sdist_builder image
- Reorders Dockerfile steps to optimize image cache between prod and dev builds
- Unifies VENV_BASE and COLLECTION_BASE in prod and dev builds
 2020-12-26 13:16:42 -05:00
Shane McDonald
8ceb505977 Add standalone target for rendering official Dockerfile 
With the next commit it will be possible to run:

```
$ make Dockerfile
$ docker build .
```
 2020-12-26 13:16:40 -05:00
softwarefactory-project-zuul[bot]
cb5c16918c
Merge pull request #8928 from mabashian/8207-cancel-button-disable 
Disable cancel button on jobs list when one or more selected jobs is not running

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-12-23 01:27:47 +00:00
softwarefactory-project-zuul[bot]
2a353a809b
Merge pull request #8959 from jakemcdermott/fix-8884 
Default to lang in catalog when browser preference unavailable

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-12-22 23:09:27 +00:00
softwarefactory-project-zuul[bot]
0b364b2918
Merge pull request #8972 from shanemcd/sorry-jake 
Restore old behavior of ui-devel

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-12-22 22:58:17 +00:00
Shane McDonald
4219089166 Restore old behavior of ui-devel 2020-12-22 17:20:20 -05:00