External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-16 12:20:45 -03:30
Code Issues Packages Projects Releases Wiki Activity
21,775 Commits 54 Branches 19 Tags
Commit Graph

21775 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pebbledavec
2ff3b5d62c
Removed forwardslash that was breaking paginated workflow node requests. 
The forward-slash in getWorkflowJobTemplateNodes was incorrectly interpreted as part of the pagesize integer (and thereby throwing an exception) when a complex workflow spanned multiple pages of workflow nodes.
Resolves: #4261
Signed-off-by: Dave Compton <sircompo@gmail.com>
 2019-07-09 12:50:40 +01:00
softwarefactory-project-zuul[bot]
2aa32f61f8
Merge pull request #4290 from ryanpetrello/csp-false-positive 
specify a ng-csp attribute so Angular doesn't autodetect

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-07-09 01:58:18 +00:00
Ryan Petrello
66321a6218
specify a ng-csp attribute so Angular doesn't autodetect 
without this, we're getting a false positive log message about an unsafe
eval (which is *actually* just angular auto-detecting whether or not
eval is supported)
 2019-07-08 17:32:41 -04:00
softwarefactory-project-zuul[bot]
1f31cc9394
Merge pull request #4101 from jbradberry/fix-4099 
Include defined fields from all parent classes of a HybridDictField

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-07-08 21:15:11 +00:00
Jeff Bradberry
758ad164fe Include defined fields from all parent classes of a HybridDictField 
since our settings registry adds a mixin class when doing validation on these.

related #4099
 2019-07-08 16:05:03 -04:00
softwarefactory-project-zuul[bot]
be975fc051
Merge pull request #4283 from falcon78921/wip-awx-minor-fix 
awx/ui: minor fix on Update on Project Update description

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-07-08 19:48:28 +00:00
softwarefactory-project-zuul[bot]
04ea39c315
Merge pull request #4282 from saito-hideki/issue/tower_3590 
Fix to use "type" as the condition value for Machine credential to cover I18N

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-07-08 19:36:31 +00:00
Hideki Saito
869d259433
Fix conditional values for handle internationalization 
Fix the variable for checking the credential type from "name" to "kind"
 in order to correctly handle I18N.

Signed-off-by: Hideki Saito <saito@fgrep.org>
 2019-07-08 15:03:35 -04:00
softwarefactory-project-zuul[bot]
7faff07bd9
Merge pull request #4279 from athenahealth/fix-csp-for-safari-websockets 
Update Content Security Policy to allow websockets

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-07-08 18:00:42 +00:00
softwarefactory-project-zuul[bot]
ca83b62c21
Merge pull request #4277 from jainnikhil30/devel 
add inventory name and id to meta vars

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-07-08 16:09:49 +00:00
James McClune
8aa33b9b4a awx/ui: minor fix on Update on Project Update description 
In the Inventory Source settings, one of the update options is titled
Update on Project Change. However, the tooltip is titled
Update on Project Update. Looking at the overall AWX codebase, I think
the definitions are fitted more towards Update on Project Update.

Signed-off-by: James McClune <jmcclune@mcclunetechnologies.net>
 2019-07-07 23:36:54 -04:00
Jeff Byrnes
987cfed649
Update Content Security Policy to allow websockets 
Per #4167 a reasonable CSP was put in place, but unfortunately this
broke WebSockets support in Safari.

This is a quick fix to return support immediately. A more secure
implemetation would be beneficial in the longer term, however.
 2019-07-05 16:12:27 -04:00
softwarefactory-project-zuul[bot]
9b6644bc77
Merge pull request #4276 from ryanpetrello/ldap-tls-verify-off 
fix a bug that breaks OPT_X_TLS_REQUIRE_CERT=0 for LDAP authentication

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-07-05 15:58:47 +00:00
jainnikhil30
88a4362a7a add inventory name and id to meta vars 2019-07-05 20:37:36 +05:30
Ryan Petrello
0dcbafaccb
fix a bug that breaks OPT_X_TLS_REQUIRE_CERT=0 for LDAP authentication 2019-07-05 10:24:18 -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