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

20910 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AlanCoding
f4c18843a3
Resolve default ordering warnings from tests 2019-05-20 10:58:36 -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
softwarefactory-project-zuul[bot]
6681cd918c
Merge pull request #3906 from heavenly999/devel 
Increasing requests-credssp ver to 1.0.2

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-16 20:00:07 +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
softwarefactory-project-zuul[bot]
ff7e244a84
Merge pull request #3905 from NickBusey/patch-1 
Update INSTALL.md

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-16 17:02: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
Adam Nagy
c38ee06642 Increasing requests-credssp ver to 1.0.2 
Signed-off-by: Adam Nagy <anagy@netsuite.com>
 2019-05-16 15:56:35 +02:00
Ryan Petrello
b1d75327e3
add the ability to toggle DEBUG logging on dynamically 2019-05-16 07:58:31 -04:00
softwarefactory-project-zuul[bot]
8981c7d59a
Merge pull request #3904 from wenottingham/new-year-new-you 
Bump date.

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-16 03:35:31 +00:00
Nick Busey
b10f06201d
Update INSTALL.md 2019-05-15 16:34:27 -06: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
softwarefactory-project-zuul[bot]
efddd9f679
Merge pull request #3854 from beeankha/add_debug_toolbar 
Update Custom Middleware to New Style

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-15 18:38:24 +00: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
softwarefactory-project-zuul[bot]
6bc1856658
Merge pull request #3861 from beeankha/awx_doc_edits 
Update/Edit AWX Docs

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-13 20:41:14 +00:00
beeankha
9ea3ec24ca Address comments/suggested changes 2019-05-13 15:46:24 -04:00
beeankha
7466873f69 Make more edits/grammatical changes 2019-05-13 15:27:54 -04:00
beeankha
07fa533b6f Make edits to Notification doc 2019-05-13 11:47:04 -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
beeankha
fe344038b5 Edit Clustering doc 2019-05-10 14:54:20 -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
softwarefactory-project-zuul[bot]
18c69fa391
Merge pull request #3870 from shanemcd/gimme-root 
Ensure that a root user is always present in development environment

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-10 14:57:58 +00:00
softwarefactory-project-zuul[bot]
6d6eae571e
Merge pull request #3868 from jakemcdermott/ig-order-docstring 
add docstring and test for instance group service

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-10 14:54:52 +00:00
Shane McDonald
7d8a910be7 Improve dev environment init process 
This ensures that /etc/passwd is always written, regardless of how the container starts.
 2019-05-10 10:14:51 -04:00
Jake McDermott
df04660cdd
add test for instance groups service 2019-05-10 10:05:05 -04:00
softwarefactory-project-zuul[bot]
9d1ed837f9
Merge pull request #3869 from AlanCoding/dev_supervisor_fix 
Fix bug in dev supervisor reparenting processes

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-05-10 13:45:30 +00:00
Ryan Petrello
be4705ef8b
Merge branch 'downstream' into devel 2019-05-10 09:18:07 -04:00
Shane McDonald
015234287c Ensure that a root user is always present in development environment 
@AlanCoding was seeing errors in the development container when trying to run some commands as root. This fixes that.
 2019-05-10 09:16:28 -04:00
AlanCoding
677a8b34ba
Fix bug in dev supervisor reparenting processes 2019-05-10 07:46:53 -04:00