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

11971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ryan Petrello
bd48dcf4dd Merge pull request #5670 from ryanpetrello/log-aggregator-test-button 
add an API endpoint for testing external log aggregrator connectivity
 2017-03-09 14:55:55 -05:00
Ryan Petrello
8c1de7f109 add an API endpoint for testing external log aggregrator connectivity 
see: #5164
 2017-03-09 13:19:56 -05:00
Shane McDonald
34990c304a Remove npm hacks from unit-test-runner 
This hasnt been necessary for a while, just forgot it was here..
 2017-03-08 15:40:49 -05:00
Shane McDonald
0fa4b16660 Rebuild unit-test image for every branch 
This variable is set by Jenkins, you'll have to set it manually if you build locally.
 2017-03-08 15:40:49 -05:00
Matthew Jones
a1fce99e67 Merge branch 'stable' into devel 2017-03-08 15:35:09 -05:00
Wayne Witzel III
2918bf0180 Merge pull request #5664 from wwitzel3/issue-5608 
value_to_python should encode lookup fields as ascii
 2017-03-08 14:20:13 -05:00
Wayne Witzel III
27fc64eb56 value_to_python should encode lookup fields as ascii 2017-03-08 12:30:30 -05:00
Matthew Jones
b6444d7b86 Merge branch 'release_3.1.1' into stable 
* release_3.1.1:
  Filter on reason also when logging in via sso and picking authtoken
 2017-03-07 15:58:28 -05:00
Matthew Jones
2c7dd8497b Filter on reason also when logging in via sso and picking authtoken 2017-03-07 13:54:52 -05:00
Matthew Jones
2b2c947ac5 Merge branch 'release_3.1.1' into stable 
* release_3.1.1:
  Updating changelog for 3.1.1 release
  Fix an issue where notifications might not always be triggered
  give a default other than None
  Respect the user provided rabbitmq vhost value
  Changes to improve the AMI publish process
  Add unsupported primary pre-flight check
  Removed console
  Fixed bug where typing in scm credential when adding/editing project wouldn't work
  Encode default search param
  update asgi_amqp version
  remove uneeded post commit wrapper
  all job status change websockets events should happen after the job hits the database
  Revert "emit job status over socket after database commit"
  emit job status over socket after database commit
  requeue websocket messages that don't (yet) have an established user
  Force setting the password of the rabbitmq user
  rabbit_mq_password required
  host event stdout changes
  Bump version for 3.1.1 release
 2017-03-07 10:29:47 -05:00
Michael Abashian
f3f2be4d01 Merge pull request #5619 from mabashian/filters 
Filters organization
 2017-03-07 09:11:38 -05:00
Matthew Jones
90a26de180 Fix an issue where notifications might not always be triggered 
In the case where a notification template were assigned to "failed"
events but not "success" or "any" events.
 2017-03-06 15:41:43 -05:00
Michael Abashian
506fae0b9c First pass at unit tests for the filters in shared/filters 2017-03-03 11:50:40 -05:00
Jared Tabor
795b71082d Merge pull request #5618 from jaredevantabor/upgrade-cookieStore 
updating $cookieStore to $cookie
 2017-03-02 14:07:42 -08:00
Michael Abashian
4dfe85af7f Filters organization 2017-03-02 17:00:04 -05:00
jaredevantabor
a2a0a3194f updating $cookieStore to $cookie 
b/c it was deprecated in Angular 1.4
 2017-03-02 13:10:19 -08:00
Michael Abashian
a4e60b711f Merge pull request #5610 from mabashian/shared-appjs 
Import shared modules in shared/main.js rather than app.js
 2017-03-02 15:49:12 -05:00
Chris Meyers
a2320c5b5e Merge pull request #5614 from chrismeyersfsu/fix-5613 
give a default other than None
 2017-03-02 14:25:12 -05:00
Chris Meyers
54bcdccdab give a default other than None 
1. If the setting isn't in the database, then the specified default is
returned.
2. If the setting IS in the database, then the 'value' field, from the
database, is returned; Unless, the value is null in the database, then
the defined default is returned.
* Take case 1. If the default=None then an AttributeError is raised
* Thus, by setting default='', in case 1. We don't get an AttributeError
because '' will be returned.
* Also note that we don't allow_null=True because then the database
entry could be None. Accessing the setting would raise an AttributeError
in this case. Further, since we set default='' it doesn't matter if null
is in the database.

TL;DR set default=<something_other_than_None>
 2017-03-02 13:36:48 -05:00
Michael Abashian
956beba290 Import shared modules in shared/main.js rather than app.js 2017-03-02 10:51:15 -05:00
Michael Abashian
0d2f16d34d Merge branch 'mabashian-modularize-helpers-utilities' into devel 2017-03-02 10:23:32 -05:00
Michael Abashian
778c4ab557 Merge branch 'modularize-helpers-utilities' of https://github.com/mabashian/ansible-tower into mabashian-modularize-helpers-utilities 
# Conflicts:
#	awx/ui/client/src/activity-stream/main.js
#	awx/ui/client/src/app.js
#	awx/ui/client/src/helpers.js
#	awx/ui/client/src/helpers/Credentials.js
#	awx/ui/client/src/helpers/Groups.js
#	awx/ui/client/src/helpers/Hosts.js
#	awx/ui/client/src/helpers/teams.js
 2017-03-02 10:20:32 -05:00
Michael Abashian
f174afb6df Import variables, parse, loadconfig in the correct place 2017-03-01 16:43:28 -05:00
Michael Abashian
999c3dca08 Merge pull request #5602 from mabashian/5600-project-scm-cred 
Typing in scm credential when add/edit project fix
 2017-03-01 16:30:11 -05:00
Jared Tabor
c839bb67d0 Merge pull request #5594 from jaredevantabor/decouple-jobDetails-jobResults 
RIP Old Job Details Page
 2017-03-01 13:14:21 -08:00
jaredevantabor
7f16036171 fixing merge conflicts 2017-03-01 12:56:30 -08:00
jaredevantabor
66352ce5c9 removing last reference to job detail of any kind 2017-03-01 12:54:30 -08:00
jaredevantabor
dc5716f0ea changing jobDetail to jobResults throughout the app 2017-03-01 12:54:30 -08:00
jaredevantabor
daa3746ef7 removing helpers/JobDetail.js 2017-03-01 12:54:30 -08:00
jaredevantabor
14d9eb9277 removing some old stale code from host event stdout after decoupling job-results from job-details 2017-03-01 12:53:20 -08:00
jaredevantabor
edaf3e1f25 removing old job-details folder 2017-03-01 12:53:20 -08:00
jaredevantabor
5c22cb1f69 moving some functions from JobDetailService to jobResultsService 
in order to decouple the old job details from the new job results so we can
remove the job detail files at some point
 2017-03-01 12:52:25 -08:00
James Laska
59b08cfbaf Merge pull request #5604 from jlaska/ami_playbook_changes 
Playbook changes to improve AMI publishing
 2017-03-01 14:59:43 -05:00
James Laska
6d3c37b1ef Merge pull request #5598 from jlaska/preflight_old_ha_inventory 
Add unsupported primary pre-flight check
 2017-03-01 14:51:02 -05:00
Michael Abashian
6604a36bc9 Merge pull request #5599 from mabashian/cleanup-widgets 
Cleanup widgets
 2017-03-01 14:25:32 -05:00
Michael Abashian
43c5c13311 Merge pull request #5595 from mabashian/5581-encode-default-search 
Encode default search param
 2017-03-01 14:24:16 -05:00
Michael Abashian
2697fcdbc3 Removed console 2017-03-01 14:14:08 -05:00
Michael Abashian
2610009b56 Fixed bug where typing in scm credential when adding/editing project wouldn't work 2017-03-01 14:12:03 -05:00
jlmitch5
2b838a3978 Merge pull request #5592 from jlmitch5/removeOldSearchComments 
remove old search comments
 2017-03-01 14:03:16 -05:00
John Mitchell
45620f35a3 fix jshint error 2017-03-01 13:50:02 -05:00
John Mitchell
55b74ddd23 fix refresh and refreshJobs functions 2017-03-01 12:46:39 -05:00
Michael Abashian
ab0e20c976 Remove StreamWidget 2017-03-01 11:54:18 -05:00
Michael Abashian
239d3001d1 Widgets dir cleanup 2017-03-01 11:48:38 -05:00
Michael Abashian
09771927c9 Encode default search param 2017-03-01 10:27:28 -05:00
Alan Rominger
9e109019fe Merge pull request #5574 from AlanCoding/req_test_dev 
In requirements test, skip -e entries from pip freeze
 2017-03-01 09:21:43 -05:00
AlanCoding
f90ba8e6a6 small refactor of python requirement test to work in dev env 2017-03-01 09:04:31 -05:00
Michael Abashian
0487b664ca Fixed unit tests 2017-02-28 16:30:57 -05:00
Wayne Witzel III
87da7d6a93 Merge pull request #5591 from wwitzel3/release_3.1.1 
update asgi_amqp version
 2017-02-28 16:04:30 -05:00
Michael Abashian
d6ba134234 Helpers directory cleanup 2017-02-28 15:54:04 -05:00
John Mitchell
cb30b47098 remove old search comments 2017-02-28 15:46:32 -05:00