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

11918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Michael Abashian
09771927c9 Encode default search param 2017-03-01 10:27:28 -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
Jared Tabor
5592d44ec1 Merge pull request #5578 from jaredevantabor/host-event-stdout 
host event stdout changes
 2017-02-28 12:36:00 -08:00
Wayne Witzel III
9eed328107 update asgi_amqp version 2017-02-28 14:03:52 -05:00
Chris Meyers
9db49d9819 Merge pull request #5586 from chrismeyersfsu/fix-job_start_websocket_race 
emit job status over socket after database commit
 2017-02-28 13:25:44 -05:00
Chris Meyers
c4fb88c0d9 remove uneeded post commit wrapper 
* Since we changed the lower level method to always use post commit
message emit
 2017-02-28 13:10:00 -05:00
Chris Meyers
e09497108e all job status change websockets events should happen after the job hits 
the database
 2017-02-28 12:56:55 -05:00
Chris Meyers
b85361732b Revert "emit job status over socket after database commit" 
This reverts commit edefeeacdaf11cf484a4b4893ee9acde5ef85390.
 2017-02-28 12:53:59 -05:00
Chris Meyers
7da52c8bef emit job status over socket after database commit 
* Wait until the newly created job record hits the database before
telling the websocket clients that the job's status is "pending"
 2017-02-28 12:39:55 -05:00
Ryan Petrello
d95b49d3e1 Merge pull request #5579 from ryanpetrello/release_3.1.1 
requeue websocket messages that don't (yet) have an established user
 2017-02-28 11:20:12 -05:00
Ryan Petrello
45819f6b9a requeue websocket messages that don't (yet) have an established user 
There's a race between our `ws_connect` and `ws_receive` methods;
it's possible to fall into a scenario where we're handling a legitimate
message *before* django-channels is able to persist the `user_id` into
the channel session.  This results in a scenario where a user can open
a browser tab and never receive new websocket messages.  In this
scenario, we should just toss the message back into the queue and try
again later (up to a reasonable limit of retries).
 2017-02-28 11:12:59 -05:00
Chris Meyers
4271dc23d4 Merge pull request #5580 from chrismeyersfsu/fix-rabbit_mq_password_required 
rabbit_mq_password required
 2017-02-28 10:39:40 -05:00
jaredevantabor
9cbf9a5c47 host event stdout changes 2017-02-27 18:52:45 -08:00
Matthew Jones
cdb757503e Bump version for 3.1.1 release 2017-02-27 21:17:51 -05:00
Matthew Jones
fc66bb1e42 Merge branch 'release_3.1.0' into stable 
* release_3.1.0: (2069 commits)
  Updating changelog for 3.1 release
  Switch job_type to check from sync when detecting delete_on_update
  use Unicode apostrophes - not single quotes - for French i18n strings
  pin appdirs==1.4.2
  only cancel deps if we can cancel the inv update
  fixing module_name check and adding support for the debug module
  cancel jobs dependent on inv update
  update tests
  CSS tweaks to workflow results panels
  like inventory updates, check if project update deps already processed
  Revert "Merge pull request #5553 from chrismeyersfsu/fix-waiting_blocked"
  Add awx/ui/client/languages to .gitignore
  Delete awx/ui/client/languages/*.json
  refactor based on review
  Add missing permission check.
  Make current_groups a set to easily avoid duplicates, update asgi-amqp requirement
  avoid duplicated related search fields
  Fix workflow audit items
  fixing module name, json blob, and stdout-for-yum-module on host event
  just like we fail running tasks fail waiting tasks
  ...
 2017-02-27 16:27:16 -05:00
Matthew Jones
98daaece73 Switch job_type to check from sync when detecting delete_on_update 2017-02-27 16:22:05 -05:00
Ryan Petrello
242e1b543c Merge pull request #5552 from ryanpetrello/fix-5536 
use Unicode apostrophes - not single quotes - for French i18n strings
 2017-02-27 12:31:33 -05:00
Ryan Petrello
e8ecc4226b use Unicode apostrophes - not single quotes - for French i18n strings 
see: #5536
 2017-02-27 12:23:07 -05:00
Ryan Petrello
1878fbf973 Merge pull request #5573 from ryanpetrello/fix-appdirs-dep 
pin appdirs==1.4.2
 2017-02-27 12:21:54 -05:00
Chris Meyers
e6e636f247 Merge pull request #5571 from chrismeyersfsu/fix-5566 
cancel jobs dependent on inv update
 2017-02-27 12:08:09 -05:00
Ryan Petrello
30a3439aa9 pin appdirs==1.4.2 
setuptools requires appdirs >= 1.4.0
ff371f18f0 (diff-2eeaed663bd0d25b7e608891384b7298)
 2017-02-27 12:06:35 -05:00
Jared Tabor
d72c79fb26 Merge pull request #5572 from jaredevantabor/host-event-stdout 
fixing module_name check and adding support for the debug module
 2017-02-27 08:44:44 -08:00
Chris Meyers
c1bace87ab only cancel deps if we can cancel the inv update 2017-02-27 11:37:29 -05:00
jaredevantabor
683a1252c8 fixing module_name check and adding support for the debug module 2017-02-27 08:33:53 -08:00
Chris Meyers
f3e514246e cancel jobs dependent on inv update 2017-02-27 11:28:29 -05:00
Michael Abashian
a1840863da Merge pull request #5569 from mabashian/5563-footer 
CSS tweaks to workflow results panels
 2017-02-27 11:16:49 -05:00
Chris Meyers
fcbce13873 Merge pull request #5568 from chrismeyersfsu/fix-5562 
revert waiting task stuck fix
 2017-02-27 11:03:23 -05:00
Chris Meyers
9f8df08e1d update tests 2017-02-27 10:56:34 -05:00
Michael Abashian
5c5ab0936e CSS tweaks to workflow results panels 2017-02-27 10:53:41 -05:00
Chris Meyers
a1c76d3adc like inventory updates, check if project update deps already processed 2017-02-27 10:34:44 -05:00
Wayne Witzel III
c919f1ef30 Merge pull request #5487 from wwitzel3/issue-5341 
explicit ordering in workflow_nodes views
 2017-02-27 10:06:58 -05:00
Aaron Tan
fe3605ccdd Merge pull request #5534 from jangsutsr/3551_restore_original_behavior_of_group_children_unattach 
Restore original behavior of group children unattach
 2017-02-27 10:05:15 -05:00
Michael Abashian
691dbdcbd8 Merge pull request #5559 from mabashian/workflow-audit-items 
Fix workflow audit items
 2017-02-27 09:40:41 -05:00
Chris Meyers
dd513621f0 Revert "Merge pull request #5553 from chrismeyersfsu/fix-waiting_blocked" 
This reverts commit 9ba2122f4f85eecaeb6fa53ac92ea2811b05e83f, reversing
changes made to c3a5f2c96fd85dd1405a8f5c875ffc988dee16a4.
 2017-02-27 09:38:45 -05:00
Shane McDonald
739f4e6a50 Add awx/ui/client/languages to .gitignore 2017-02-27 08:56:59 -05:00
Shane McDonald
87f60221ac Delete awx/ui/client/languages/*.json 
This should have been in .gitignore
 2017-02-27 08:56:25 -05:00
Wayne Witzel III
a04411817f refactor based on review 2017-02-24 17:12:40 -05:00
Wayne Witzel III
ebd4064b82 Merge pull request #5561 from wwitzel3/release_3.1.0 
Make current_groups a set, update asgi-amqp req
 2017-02-24 17:08:02 -05:00
Aaron Tan
f11a220e64 Add missing permission check. 2017-02-24 17:06:57 -05:00
Wayne Witzel III
4d02ee9445 Make current_groups a set to easily avoid duplicates, update asgi-amqp requirement 2017-02-24 16:59:39 -05:00
Aaron Tan
7415880f20 Merge pull request #5515 from jangsutsr/3254_update_host_detail_put_option 
Update host detail put option rework
 2017-02-24 16:58:09 -05:00