External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-22 10:20:24 -02:30
Code Issues Packages Projects Releases Wiki Activity
20,915 Commits 57 Branches 102 Tags
9d4cfa74001c50b1a047b529b8fb152d908dc265
Commit Graph

16837 Commits

Author SHA1 Message Date
AlanCoding
06be3a29b9 fix Django debug toolbar after its upgrade 2019-05-20 12:17:57 -04:00
softwarefactory-project-zuul[bot]
2addf20907 Merge pull request #3918 from jbradberry/middleware-ordering 
Fix the middleware ordering

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-20 15:43:06 +00:00
AlanCoding
f4c18843a3 Resolve default ordering warnings from tests 2019-05-20 10:58:36 -04:00
Jeff Bradberry
44907b33dc Fix the middleware ordering 2019-05-17 14:40:33 -04:00
softwarefactory-project-zuul[bot]
f174902bb2 Merge pull request #3874 from jbradberry/expose-role-type 
Expose the content type associated with roles for ActivityStream objects in the API

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-17 18:06:38 +00:00
softwarefactory-project-zuul[bot]
ab1e45d6c4 Merge pull request #3875 from rooftopcellist/swifty_operation 
reorder migrations to avoid session error

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-17 15:41:26 +00:00
softwarefactory-project-zuul[bot]
bd50e5d6a8 Merge pull request #3896 from rooftopcellist/collection_no_reset 
collect events based on last ship, not collection

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-17 15:32:48 +00:00
softwarefactory-project-zuul[bot]
d353daebc5 Merge pull request #3911 from rooftopcellist/rm_extra_error 
rm extra collection error line

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-16 20:11:41 +00:00
Christian Adams
2b327935de reorder migrations to avoid session error 2019-05-16 15:13:47 -04:00
Christian Adams
0c4925afe8 rm extra collection error line 2019-05-16 14:48:41 -04:00
softwarefactory-project-zuul[bot]
e0062484d0 Merge pull request #3908 from rverchere/fr_fix 
Correct fr translation for Cancel message

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-16 18:46:19 +00:00
softwarefactory-project-zuul[bot]
faa353521a Merge pull request #3909 from marshmalien/3884-dropdown-alignment 
Fix styling bug in Sort Dropdown

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-16 18:03:07 +00:00
Marliana Lara
17f71600df Add styles to grow dropdown width based on content 2019-05-16 12:23:47 -04:00
Rémi VERCHERE
9120a69006 Correct fr translation for Cancel message 2019-05-16 17:42:13 +02:00
softwarefactory-project-zuul[bot]
d9965cfe7e Merge pull request #3882 from ryanpetrello/debug-log 
add the ability to toggle DEBUG logging on dynamically

Reviewed-by: Shane McDonald <me@shanemcd.com>
             https://github.com/shanemcd
 2019-05-16 15:12:01 +00:00
Ryan Petrello
b1d75327e3 add the ability to toggle DEBUG logging on dynamically 2019-05-16 07:58:31 -04:00
Bill Nottingham
681fe4865c Some more dates. 2019-05-15 17:01:33 -04:00
Bill Nottingham
faae55d085 Bump date. 2019-05-15 16:58:59 -04:00
beeankha
6fb173da8a Remove redundant methods from SocialAuthMiddleware class 2019-05-15 12:54:00 -04:00
beeankha
64e8b76a10 Remove redundant middleware 2019-05-15 10:16:20 -04:00
Christian Adams
d0e160a037 collect events based on last ship, not collection 2019-05-14 17:14:44 -04:00
beeankha
20e5d8200e Subclass more middlware with deprecation mixin 2019-05-14 13:37:34 -04:00
beeankha
a6d3c0fd32 Remove redundant code and update URLModificationMiddleware 2019-05-14 13:37:34 -04:00
beeankha
318e0631b7 Add super() call 2019-05-14 13:37:34 -04:00
beeankha
da4153d653 Add mixin to ActivityStreamMiddleware class 2019-05-14 13:37:34 -04:00
beeankha
26e9dd307e Fix missing argument error 2019-05-14 13:37:34 -04:00
beeankha
6a2d59963f Update wsgi file to be compatible with new style of middleware 2019-05-14 13:37:34 -04:00
beeankha
68800d0e8e Make custom middleware use new style vs old 2019-05-14 13:37:34 -04:00
beeankha
97dc77ea63 Add debug_toolbar.middleware.DebugToolbarMiddleware to MIDDLEWARE classes in development.py 2019-05-14 13:37:34 -04:00
Jeff Bradberry
3579584ffc i18n 2019-05-13 11:20:15 -04:00
Jeff Bradberry
05cae23180 Add help text to the ActivityStreamSerializer m2m relationship fields 2019-05-13 11:10:33 -04:00
Jeff Bradberry
d6e89092d3 Instead of exposing Role.content_type, create a new serializer field 
called `object_type`, which is constructed based on manipulating the
string value of ActivityStream.object_relationship_type.  Since that
field does have the full class name, this manipulation should match
the manipulation that is done to construct the values of object1 and
object2 when ActivityStream is created.
 2019-05-10 17:31:33 -04:00
Jeff Bradberry
250484339b Expose the role's content_type field and reorder the objects in the UI 
when the resource was stored on ActivityStream as object1 instead of object2.

related #3841
 2019-05-10 14:15:05 -04:00
softwarefactory-project-zuul[bot]
0d3f1f4ac2 Merge pull request #3871 from ryanpetrello/devel 
merge in downstream changes

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-10 16:21:39 +00:00
Jake McDermott
df04660cdd add test for instance groups service 2019-05-10 10:05:05 -04:00
Ryan Petrello
be4705ef8b Merge branch 'downstream' into devel 2019-05-10 09:18:07 -04:00
Jake McDermott
232c706b75 add docstring for instance group service 2019-05-10 07:16:50 -04:00
softwarefactory-project-zuul[bot]
8725d3e539 Merge pull request #3842 from ryanpetrello/instance-group-order 
enforce a stable list order when attaching/detaching instance groups

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-09 21:04:29 +00:00
Christian Adams
21105b836e more verbose list_instance messaging 2019-05-09 15:08:56 -04:00
softwarefactory-project-zuul[bot]
6feb58f76d Merge pull request #3853 from AlanCoding/variable_data_permission 
Put variable data permission in its own class

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-09 16:48:11 +00:00
softwarefactory-project-zuul[bot]
91968a09c8 Merge pull request #3849 from AlanCoding/password_madness 
Reduce passing around of passwords dictionary

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-09 13:34:43 +00:00
softwarefactory-project-zuul[bot]
190098bbd5 Merge pull request #3848 from AlanCoding/standard_injector 
Move outlier gce cache logic to standard place

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-09 12:56:11 +00:00
AlanCoding
2585c5030b move outlier gce cache logic to standard place 2019-05-09 08:24:57 -04:00
AlanCoding
7e6a73f892 fix bug with null credential 2019-05-08 21:18:34 -04:00
AlanCoding
1874e8bb4c Reduce passing around of passwords dictionary 2019-05-08 21:18:34 -04:00
softwarefactory-project-zuul[bot]
186ec88581 Merge pull request #3839 from zicklam/webhook_disable_ssl_verify 
Add "Disable SSL Verification" checkbox to webhook notification

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-08 19:44:11 +00:00
mabashian
e1de0a528d Adds some test coverage for host_filter queries 2019-05-08 14:59:04 -04:00
AlanCoding
231abf865b put variable data permission in its own class 2019-05-08 13:43:13 -04:00
Ryan Petrello
993b0a889d add API tests for InstanceGroup order persistence 2019-05-08 11:56:30 -04:00
Jake McDermott
205f2c33c1 wait for instance group requests on template save 2019-05-08 11:56:19 -04:00