1
0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 23:51:09 +03:00
Commit Graph

21761 Commits

Author SHA1 Message Date
Alex Corey
320581a6c0 Addresses PR issues 2019-07-03 12:43:40 -04:00
softwarefactory-project-zuul[bot]
d4f50896de
Merge pull request #4260 from fantashley/fix-docker-module-name
Change to docker_service for compatibility

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-07-03 12:28:35 +00:00
softwarefactory-project-zuul[bot]
71812c66d2
Merge pull request #4118 from DanielDisisto/patch-1
Failing requirements update when scm_type != git

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-07-03 12:17:05 +00:00
softwarefactory-project-zuul[bot]
731d8c21e8
Merge pull request #4252 from ansible/jakemcdermott-fix-readme-snippet
fix README snippet

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-07-03 11:55:05 +00:00
DanielDisisto
3247983823
Failing requirements update when scm_type != git
The `git_result` variable is incorrectly checked as being `defined` vs. `not skipped`. This causes SVN (or any non-GIT) project update to fail consistently when `doesRequirementsExist.stat.exists` is true

Signed-off-by: DanielDisisto <daniel.disisto@didata.com.au>
2019-07-03 07:51:01 -04:00
Ashley Nelson
485536d4cf Change to docker_service for compatibility 2019-07-02 16:03:43 -05:00
softwarefactory-project-zuul[bot]
b37040a85c
Merge pull request #4256 from ryanpetrello/inline-image-csp
allow data: images in our Content Security Policy

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-07-02 17:13:10 +00:00
softwarefactory-project-zuul[bot]
84ad1cdfcd
Merge pull request #4250 from kialam/fix-254-delete-last-elem-list-page
Fix 254 delete last elem list page

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-07-02 16:17:51 +00:00
Ryan Petrello
75a72637dd
allow data: images in our Content Security Policy
support for custom login logos relies on data:image/*;base64
see: https://github.com/ansible/awx/issues/4253
2019-07-02 11:35:56 -04:00
Kia Lam
74e4c17b63
Address PR feedback and format. 2019-07-02 09:54:07 -04:00
softwarefactory-project-zuul[bot]
c65ae87d69
Merge pull request #4175 from jainnikhil30/devel
fix the hashivault v2 lookup

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-07-02 12:42:41 +00:00
jainnikhil30
dbf8df479b
use path instead of *path while dong the join 2019-07-02 07:55:35 -04:00
jainnikhil30
764947c1ae
fix the hashivault v2 lookup 2019-07-02 07:55:32 -04:00
Jake McDermott
0b724682da
fix README snippet 2019-07-01 19:50:16 -04:00
softwarefactory-project-zuul[bot]
4fb055345d
Merge pull request #4199 from mabashian/264-notification-type-column
Show notification type in its own column

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-07-01 22:57:50 +00:00
Kia Lam
d3ed6ac73a
Fix Template list as well. 2019-07-01 16:21:41 -04:00
Kia Lam
d22cafc42e
Add unit test. 2019-07-01 16:20:38 -04:00
Kia Lam
58444a75b9
Fix Org list returning a 404 by redirecting user to current page.
- Update itemCount after an org has been successfully deleted.
- Update PaginatedDataList to get current page when the number of items has changed.
2019-07-01 16:20:38 -04:00
softwarefactory-project-zuul[bot]
7178c1d9e0
Merge pull request #4200 from ansible/jakemcdermott-contrib-formatter
run formatting check with ci

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-07-01 19:28:39 +00:00
Jake McDermott
945d9156a6 do formatting check with ci linter 2019-07-01 14:27:25 -04:00
Jake McDermott
bf86719412
add a note about running the formatter 2019-07-01 14:16:17 -04:00
mabashian
12c0b80102 Prettify files 2019-07-01 13:51:13 -04:00
mabashian
1d2c21249b Show notification type in its own column 2019-07-01 13:49:38 -04:00
softwarefactory-project-zuul[bot]
3371a6f386
Merge pull request #4188 from mabashian/awx-pf-migration
Pull beginning of new ui application using React and Patternfly into AWX

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-07-01 17:31:32 +00:00
softwarefactory-project-zuul[bot]
e79fbab737
Merge pull request #4196 from shanemcd/devel
Release 6.0.0

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-07-01 17:03:29 +00:00
Shane McDonald
4f829ab93f Release 6.0.0 2019-07-01 12:47:37 -04:00
mabashian
8f74bad1c1 Roll back changes to test linting and unit test gating 2019-07-01 12:34:09 -04:00
softwarefactory-project-zuul[bot]
5ce78b383d
Merge pull request #4190 from ryanpetrello/ldap-dict-order
fix a bug that causes LDAP TLS connection flags to not be set properly

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-07-01 16:19:51 +00:00
mabashian
02d320de71 Commit to test linting and unit test gating 2019-07-01 12:04:45 -04:00
softwarefactory-project-zuul[bot]
2404faa5d8
Merge pull request #4184 from rooftopcellist/delete_tarball
Delete collection tarball when no longer needed

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-07-01 15:44:49 +00:00
Christian Adams
e72b2fac6d Delete collection tarball when no longer needed
* Delete after shipping it
   * Delete when ship() fails
2019-07-01 11:11:44 -04:00
Ryan Petrello
11b36982cd
fix a bug that causes LDAP TLS connection flags to not be set properly
co-authored-by: Jim Ladd <jladd@redhat.com>
2019-06-28 22:15:35 -04:00
softwarefactory-project-zuul[bot]
d438a93fd2
Merge pull request #4183 from ryanpetrello/logging-deadlock
don't ship external logs from the main thread of the dispatcher

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-06-28 16:24:27 +00:00
mabashian
5cb8bd34ac Adds make targets for linting/tests in ui_next. Modifies existing clean-ui target to clean ui_next as well. 2019-06-28 12:11:07 -04:00
mabashian
b457926b38 Update usage instructions since paths have changed 2019-06-28 10:50:49 -04:00
mabashian
55ce409a12 Run prettier on all the files in awx/ui_next 2019-06-28 09:26:11 -04:00
mabashian
051bbcaeb5 Remove gitignore from awx/ui_next and add rules to base gitignore 2019-06-28 09:23:45 -04:00
mabashian
2de5fbdac7 Merge awx-pf into awx 2019-06-28 09:09:52 -04:00
Ryan Petrello
dfa8d44eb8
don't ship external logs from the main thread of the dispatcher
this is a fairly esoteric change that attempts to work around a bug
we've discovered in cpython itself

context: https://github.com/ansible/awx/issues/4181
2019-06-27 16:24:36 -04:00
softwarefactory-project-zuul[bot]
4470e9ca26
Merge pull request #4178 from rooftopcellist/collection_datetime_str
Fix collection datetime for isolated instance info

Reviewed-by: Elijah DeLee <kdelee@redhat.com>
             https://github.com/kdelee
2019-06-27 20:03:46 +00:00
softwarefactory-project-zuul[bot]
cf0fe729f5
Merge pull request #4039 from mabashian/application-lookup-column
Fix user token application lookup column widths

Reviewed-by: Michael Abashian
             https://github.com/mabashian
2019-06-27 18:31:48 +00:00
mabashian
913e06b865 Fix user token application lookup column widths 2019-06-27 13:32:51 -04:00
Christian Adams
4d7c49372c Fix collection datetime for isolated instance info
* 'last_isolated_check' was a non JSON-serializable object and needed to be a str
2019-06-27 13:31:10 -04:00
Michael Abashian
43592cbe00
Move everything to awx/ui_next (#297) 2019-06-27 11:11:58 -04:00
softwarefactory-project-zuul[bot]
5c338e582a
Merge pull request #4167 from ryanpetrello/csp
add a reasonable default Content Security Policy

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-06-26 20:21:20 +00:00
Michael Abashian
0a6fc8cb89
Fix for unit test failure in jt detail test where getting instance groups wasn't mocked (#296)
Fix for unit test failure in jt detail test where getting instance groups wasn't mocked.
2019-06-26 16:07:58 -04:00
Marliana Lara
5e6562023d
Merge pull request #295 from marshmalien/job-template-directory-name
Job template directory name
2019-06-26 15:10:33 -04:00
Marliana Lara
14280ec53b
Update launch button hover styles 2019-06-26 14:51:27 -04:00
Marliana Lara
edef496583
Update job template breadcrumb content 2019-06-26 14:49:10 -04:00
Marliana Lara
cfc0a4771f
Update the JT Edit directory, file, and component names 2019-06-26 14:45:35 -04:00