External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-16 08:50:10 -02:30
Code Issues Packages Projects Releases Wiki Activity
21,770 Commits 65 Branches 102 Tags
be975fc051609982741acd75063e5385c0ad3d26
Commit Graph
30 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
softwarefactory-project-zuul[bot] 273415b9aa Merge pull request #4077 from j-shade/devel 
fixed row item labels to view horizontally instead of vertically

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-26 12:50:16 +00:00
softwarefactory-project-zuul[bot] 0a7d6e603e Merge pull request #4165 from shanemcd/sane-working-dir 
Use the source tree as the working directory for our dev env

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-26 00:58:37 +00:00
softwarefactory-project-zuul[bot] cbe6c5bd3b Merge pull request #4164 from aubrel/devel 
Change `docker_service` to `docker_compose`.

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-25 21:45:49 +00:00
softwarefactory-project-zuul[bot] aab29bef5b Merge pull request #4141 from ryanpetrello/ovirt4-dep-bump 
bump ovirtsdk version to 4.3.0

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-24 21:18:40 +00:00
softwarefactory-project-zuul[bot] 9f42d9426c Merge pull request #4137 from chrismeyersfsu/fix-smart_inv_race 
wrap smart inv cache update w/ advisory lock

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-21 20:25:10 +00:00
softwarefactory-project-zuul[bot] b369609f07 Merge pull request #4103 from AlexSCorey/79-NotifyOnJobStart 
Adds notify on start toggle

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-21 16:51:52 +00:00
softwarefactory-project-zuul[bot] c46be3e718 Merge pull request #4083 from rmkraus/devel 
Updated ovirt4 dynamic inventory script.

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-21 16:40:29 +00:00
softwarefactory-project-zuul[bot] 38aedcdd48 Merge pull request #4136 from Spredzy/revert_makefile 
Revert "Makefile: align pip and setuptools bump"

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-21 13:42:26 +00:00
softwarefactory-project-zuul[bot] 59bec99f4c Merge pull request #4128 from tchellomello/k8s-annotations 
Introduces the ability to pass annotations to the Kubernetes Ingress Controllers

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-06-21 13:14:47 +00:00