11909 Commits

Author SHA1 Message Date
Graham Mainwaring
4b68a2f208 Merge pull request #5582 from ghjm/devel
Fix MD5 for CentOS 7.3 ISO
2017-02-28 14:21:17 -05:00
Ryan Petrello
7b34b36e5e Merge pull request #5576 from ryanpetrello/fix-4756
prohibit API payloads that represent something other than a JSON object
2017-02-28 14:04:32 -05:00
Ryan Petrello
d97ff57cda prohibit API payloads that represent something other than a JSON object
The JSON serializer for our API uses ``json.loads``, which permits *any*
valid JSON (including bare integers, boolean values, etc).  Lots of our
code, however, assumes that inbound JSON content will be a dict.

see: #4756
2017-02-28 13:23:03 -05:00
Michael Abashian
e5cfa51410 Merge pull request #5584 from mabashian/controllers-audit
Leftover cleanup from 3.1 back to devel
2017-02-28 12:39:37 -05:00
Michael Abashian
bfcbd8a823 Leftover cleanup from 3.1 back to devel 2017-02-28 12:03:41 -05:00
Matthew Jones
1fefa4cfdd Merge branch 'stable' into devel
* stable: (275 commits)
  Install correct rpm-sign package in RPM builder
  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
  ...
2017-02-28 11:37:05 -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
Michael Abashian
a5e4074575 Merge pull request #5530 from mabashian/modularize-v1
Modularized what was left in the controllers directory
2017-02-27 12:55:01 -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
Alan Rominger
8b383e788b Merge pull request #5560 from AlanCoding/dup_related
Avoid duplicated related search fields
2017-02-24 16:55:25 -05:00
AlanCoding
84e2f4d626 avoid duplicated related search fields 2017-02-24 16:49:54 -05:00
Jared Tabor
33ca5c6270 Merge pull request #5557 from jaredevantabor/host-event-stdout
Host event modal changes, hopefully for the last time
2017-02-24 13:43:25 -08:00
Michael Abashian
c6c10658f1 Fix workflow audit items 2017-02-24 16:19:06 -05:00
Chris Meyers
d020c81047 Merge pull request #5553 from chrismeyersfsu/fix-waiting_blocked
just like we fail running tasks fail waiting tasks
2017-02-24 16:18:02 -05:00
jaredevantabor
655ddca1d3 fixing module name, json blob, and stdout-for-yum-module on host event 2017-02-24 12:43:38 -08:00
Chris Meyers
903d0472f0 just like we fail running tasks fail waiting tasks
* Associate the celery_id with the job at the earliest point possible.
This ensures that a waiting job has a celery id. Thus, we are free to
fail waiting jobs that don't have a celery id.
2017-02-24 12:07:04 -05:00
Wayne Witzel III
1d74b4ea9b Merge pull request #5551 from wwitzel3/release_3.1.0
run clustered as privleged to avoid namespace error
2017-02-24 11:19:28 -05:00
Wayne Witzel III
50f187b78c run clustered as privleged to avoid namespace error 2017-02-24 11:12:39 -05:00
Matthew Jones
1a946d51c1 Fix an issue with sync vs run project updates
We need to not remove the source tree on project update run which
happens in the context of the job run to prevent the directory from
being deleted out from under the job runners. Since those will
inherently not block each other as the project update would
2017-02-24 11:03:48 -05:00
jlmitch5
d8151b05b8 Merge pull request #5550 from jlmitch5/fixCancelOnNonPBDetailPages
fix cancel on non playbook detail pages
2017-02-24 11:03:18 -05:00
John Mitchell
30de9569ee fix cancel on non playbook detail pages 2017-02-24 10:31:37 -05:00
Chris Meyers
bdbd2a9712 Merge pull request #5548 from chrismeyersfsu/fix-blunder
fix up nightlies
2017-02-24 10:28:50 -05:00
Chris Meyers
2f604f30d9 host may be None, account for that 2017-02-24 09:59:52 -05:00
Chris Meyers
fe3d79b5ec Revert "Merge pull request #5527 from chrismeyersfsu/fix-log_settings"
This reverts commit 3db0242ef9a8b1ce67e159b8a19e0c1e70330b7c, reversing
changes made to e6893bb7f3cf696c202c39103b432c20afa6ec08.
2017-02-24 09:59:34 -05:00
Michael Abashian
3b489977a0 Merge pull request #5543 from jaredevantabor/host-event-stdout
Host event stdout styling
2017-02-24 09:28:19 -05:00