shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 09:51:09 +03:00
Code Releases Activity
18,958 Commits 40 Branches 19 Tags 380 MiB
ff1e8cc356
Commit Graph

18958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shane McDonald
3701567ad7 Revert "first-parent requires git >= 1.8.4" 
This reverts commit 1af0ee2f8c.

# Conflicts:
#	installer/roles/image_build/templates/Dockerfile.j2
 2018-09-28 15:48:33 -04:00
Shane McDonald
86140dec08 Revert "Fix sdist builder image" 
This reverts commit 97472cb91b.

# Conflicts:
#	installer/roles/image_build/tasks/main.yml
 2018-09-28 15:48:33 -04:00
Shane McDonald
50fe0392ed Updates to versioning system. 
https://github.com/ansible/awx/issues?q=%22--first-parent%22
 2018-09-28 15:48:33 -04:00
Wayne Witzel III
f18c965a8a fix test patches 2018-09-28 15:18:59 -04:00
Wayne Witzel III
f874e55051 split out mixins in views 2018-09-28 12:48:06 -04:00
Wayne Witzel III
1dcd2b1883 make views.py a directory based module 2018-09-28 12:29:12 -04:00
Ryan Petrello
7684579464
Merge pull request #2336 from ryanpetrello/fix-notification-race 
send test notifications after the transaction closes to avoid a race
 2018-09-28 10:02:02 -04:00
Ryan Petrello
16e89ed081
send test notifications after the transaction closes to avoid a race 2018-09-28 09:43:10 -04:00
Shane McDonald
62e3b9e3b6 Driveby cleanup: use built-in Make variable 2018-09-26 21:27:07 -04:00
Ryan Petrello
dc3f81920e
Merge pull request #2302 from AlanCoding/verbose_data 
create_preload_data: log no-op operation, remove unnecessary credential
 2018-09-26 16:35:18 -04:00
Ryan Petrello
8a66213dbe
Merge pull request #2298 from ryanpetrello/fix-oauth2-deprecated-token-header 
properly support deprecated `Authorization: Token xyz`
 2018-09-24 15:15:13 -04:00
Ryan Petrello
23d4122574
properly support deprecated Authorization: Token xyz 2018-09-24 14:50:33 -04:00
AlanCoding
5900af726b
log no-op operation and changed status 2018-09-21 15:23:02 -04:00
Shane McDonald
9fc4c03e5b
Merge pull request #2197 from Spredzy/minor_fixes_contributing.md 
CONTRIBUTING.md: Fixing ToC indendation and wrong links
 2018-09-20 17:51:00 -04:00
Shane McDonald
0bb1b0ed45
Merge pull request #2272 from ansible/delete-shrinkwrap 
delete old npm-shrinkwrap lock file
 2018-09-18 14:01:16 -04:00
John Mitchell
3b11219fff
delete old npm-shrinkwrap lock file 2018-09-18 13:42:02 -04:00
Shane McDonald
1b4c3f56fa
Merge pull request #2113 from kialam/upgrade-node-lts 
Upgrade Node and NPM to LTS
 2018-09-18 12:46:30 -04:00
Shane McDonald
6c5334c7d3 Update docs for new Node and NPM version requirements 2018-09-18 12:37:41 -04:00
Shane McDonald
1371e394de Update Node version in dev container image 2018-09-18 12:37:20 -04:00
Shane McDonald
ec67feef2f Bump npm version in package.json 
This is what’s served out of the 8.x LTS yum repos.
 2018-09-18 12:18:21 -04:00
Shane McDonald
89e656b2a4 Update Node version in sdist builder 2018-09-18 12:17:52 -04:00
Ryan Petrello
5910b8c562
Merge pull request #2265 from shanemcd/devel 
Merge remote-tracking branch 'downstream/release_3.3.0' into devel
 2018-09-18 08:37:02 -04:00
Shane McDonald
580004b395 Merge remote-tracking branch 'downstream/release_3.3.0' into devel 
# Conflicts:
#	awx/main/notifications/slack_backend.py
 2018-09-18 08:11:50 -04:00
Ryan Petrello
910663764f
Merge pull request #2979 from ryanpetrello/celery-init-race 
consolidate celery init signals to avoid an instance registration race
 2018-09-07 09:46:06 -04:00
Ryan Petrello
43aa0fc741
consolidate celery init signals to avoid an instance registration race 2018-09-07 09:29:53 -04:00
Jake McDermott
b9b9fc1934
Merge pull request #2974 from jakemcdermott/fix-2968 
delete text nodes when removing output lines
 2018-09-06 13:25:53 -04:00
Jake McDermott
093f453073
don't render playbook_on_start events 2018-09-06 13:17:39 -04:00
Jake McDermott
0e696d0515
add destroy hook to index controller 2018-09-06 13:17:30 -04:00
Jake McDermott
c4a29ded1c
use el.contents() to remove lines 2018-09-06 13:17:20 -04:00
Bill Nottingham
f402ff0ee7
Merge pull request #2972 from wenottingham/awx-apache 
Add a license file for awx, for completeness purposes.
 2018-09-05 13:04:35 -04:00
Bill Nottingham
b982793a3a Add a license file for awx, for completeness purposes. 2018-09-05 11:19:41 -04:00
Shane McDonald
b3f2f7efe5 Fix broken file ref 2018-09-05 00:06:11 -04:00
kialam
19f9a3f918
Merge pull request #2970 from kialam/fix/2969-empty-stdout 
Detect if `stdout` field is null or undefined.
 2018-09-04 14:11:44 -04:00
Bill Nottingham
4b2e709e8d
Merge pull request #2967 from wenottingham/legal-beagles 
Remove stale licenses, fix some name typos.
 2018-09-04 11:53:46 -04:00
kialam
146590d0c2 Detect if stdout field is null or undefined. 2018-09-04 11:05:13 -04:00
Bill Nottingham
247ee4ddac Remove stale licenses, fix some name typos. 2018-08-31 13:32:25 -04:00
Ryan Petrello
2f2294b65a
Merge pull request #2966 from ryanpetrello/fix-2950 
fix LicenseForbids 401/402 precendence for other features
 2018-08-31 12:00:50 -04:00
Ryan Petrello
ec873dd28c
fix LicenseForbids 401/402 precendence for other features 2018-08-31 11:23:11 -04:00
Ryan Petrello
c2bd36e580
Merge pull request #2965 from ryanpetrello/fix-2950 
workflow endpoints should return 401 on invalid credentials
 2018-08-31 11:16:18 -04:00
Ryan Petrello
1f8736ce1d
workflow endpoints should return 401 on invalid credentials 
if you have a license that doesn't allow use of workflows, invalid
credentials yielded an HTTP 402; this commit changes the precedence

see: https://github.com/ansible/tower/issues/2950
 2018-08-31 10:57:27 -04:00
Alan Rominger
50a9f0be6b
Merge pull request #2960 from AlanCoding/bad_locks 
Put atomic block inside lock block
 2018-08-30 14:53:01 -04:00
Ryan Petrello
8f3c5be04e
Merge pull request #2962 from ryanpetrello/fix-2952 
fix a subtle bug in awx.main.access.OAuth2ApplicationAccess.can_read
 2018-08-30 14:42:28 -04:00
Ryan Petrello
34ceaf4551
fix a subtle bug in awx.main.access.OAuth2ApplicationAccess.can_read 
see: https://github.com/ansible/tower/issues/2952
 2018-08-30 14:21:03 -04:00
AlanCoding
786e907e3b
put atomic block inside lock block 2018-08-30 12:54:53 -04:00
Ryan Petrello
c5aa9ee12b
Merge pull request #2959 from ryanpetrello/fix-2957 
don't access the database in our custom route_for_task
 2018-08-30 11:54:32 -04:00
Ryan Petrello
24f8cb49b5
don't access the database in our custom route_for_task 
If database connectivity is lost/interrupted in this block of celery
internals, beat is *not* smart enough to recover, and it gets stuck in
an endless fail loop.  We don't _need_ to talk to the database here
anyways; just use settings.CLUSTER_HOST_ID to get what we need.

see: https://github.com/ansible/tower/issues/2957
 2018-08-30 11:40:43 -04:00
Jake McDermott
54d967af0d
Merge pull request #2947 from jakemcdermott/job-results/colormap 
add basic colormap for output lines
 2018-08-30 11:40:37 -04:00
Ryan Petrello
3c91370cab
Merge pull request #2955 from ryanpetrello/fix-2951 
write custom inventory scripts to AWX_PRIVATE_DATA_DIR
 2018-08-30 09:25:42 -04:00
Bill Nottingham
e22dc3dc7b
Merge pull request #2941 from wenottingham/come-to-the-source 
Update sources to match versions... add a few missing LGPL ones.
 2018-08-30 09:21:17 -04:00
Ryan Petrello
9ae41dc3ba
write custom inventory scripts to AWX_PRIVATE_DATA_DIR 
this makes it so that custom inventory scripts can access credential
files laid down in `/tmp/awx_N_<xyz>`

see: https://github.com/ansible/tower/issues/2951
 2018-08-30 08:32:27 -04:00