Chris Meyers
a0038276a4
do not use a custom task exception
...
* Celery + json pickling do not handle custom Exceptions (and may never
do so). Mentioning of, if handling custom Exceptions then the code would
be susceptible to same arbitrary code execution that python pickle is
vulnerable to.
* So don't use custom Exceptions.
2018-01-04 15:30:52 -05:00
Chris Meyers
f0ff6ecb0a
handle_work_error signature to work
...
* celery error callback signature isn't well defined. Thus, our error
callback signature is made to handle just about any call signature and
depend on only 1 attribute, id, existing.
See https://github.com/celery/celery/issues/3709
2018-01-04 15:23:13 -05:00
Michael Abashian
815cd829e0
Merge pull request #872 from mabashian/865-jquery-ui-upgrade-bug
...
Fixed spinners after jquery-ui upgrade
2018-01-02 13:18:51 -05:00
Ryan Petrello
28c612ae9c
Merge pull request #871 from AlanCoding/dirty_extra_data
...
Fix bug when creating system job schedule
2018-01-02 09:22:07 -05:00
Bill Nottingham
d6ed6a856d
Merge pull request #845 from wenottingham/he-sees-you-when-you're-sleeping
...
Tweak collected information.
2017-12-21 13:52:11 -05:00
mabashian
706b370f7e
Fixed spinners after jquery-ui upgrade
2017-12-20 16:02:53 -05:00
AlanCoding
80a2d10742
fix bug when creating system job schedule
2017-12-20 15:30:57 -05:00
Jake McDermott
f7259a1e78
Merge pull request #844 from jakemcdermott/fix-package-json-backmerge-issue
...
package.json updates / restore ui watch functionality
2017-12-18 17:03:03 -05:00
Jake McDermott
987cdc6802
Bump versions of angular-codemirror, jquery-ui, and moment
2017-12-18 16:21:29 -05:00
Alan Rominger
6e27294e2b
Merge pull request #846 from AlanCoding/encrypt_on_save
...
Encrypt password answers on config save
2017-12-18 16:20:08 -05:00
AlanCoding
3439ba5f3b
allow WFJT nodes without required variables
2017-12-18 12:03:40 -05:00
AlanCoding
c8e10adc96
fix bug saving extra_data and follow prompts rules
...
display_extra_vars was not taking a copy of the data before
acting on it - this causes a bug where the activity stream will
modify the existing object on the model. That leads to new data
not being accepted.
Also moved the processing of extra_data to prior to the accept
or ignore kwargs logic so that we pass the right (post-encryption)
form of the variables.
2017-12-18 10:50:22 -05:00
Christian Adams
7e261b5246
Merge pull request #847 from rooftopcellist/contributing_typos
...
Fixed Typos
2017-12-15 11:09:43 -05:00
AlanCoding
1e1839915d
validate against unencrypted values at spawn point
2017-12-15 10:47:23 -05:00
AlanCoding
74bf058d62
encrypt password answers on config save
2017-12-15 07:48:55 -05:00
Matthew Jones
5ec537bad2
Merge pull request #843 from ansible/remove_old_tests
...
Removing old unused tests
2017-12-14 23:55:12 -05:00
Bill Nottingham
568901af74
Tweak collected information.
2017-12-14 19:22:18 -05:00
adamscmRH
c2e9926330
Fixed Typos
2017-12-14 16:13:04 -05:00
Jake McDermott
c4ccfa1b27
restoring ui watch functionality
2017-12-14 14:23:46 -05:00
Matthew Jones
478bcc0b07
Removing old unused tests
2017-12-14 11:34:43 -05:00
Alan Rominger
9c783aa0ce
Merge pull request #804 from AlanCoding/active_count
...
simplify query for active_count
2017-12-14 10:47:12 -05:00
Alan Rominger
526391a072
Merge pull request #838 from AlanCoding/no_unicode_loop_2
...
Avoid slowdown generating smart_filter (alternative 2)
2017-12-14 10:23:31 -05:00
AlanCoding
98f8faa349
simplify query for active_count
2017-12-14 09:53:26 -05:00
AlanCoding
8a2a5b0fb1
avoid slowdown generating smart_filter
2017-12-14 09:39:39 -05:00
Jake McDermott
07cfa6cba5
Merge pull request #834 from AlanCoding/jump-the-start-line
2017-12-13 22:43:54 -05:00
Jake McDermott
ad70754b6a
Merge pull request #832 from mabashian/linting-error-cleanup
...
Fixed linting/leftover merge errors
2017-12-13 19:46:02 -05:00
AlanCoding
9fb24f1a4c
add hack to TimingMiddlWare for Shippable tests
2017-12-13 18:49:26 -05:00
mabashian
aefa30e1e9
Fixed linting/leftover merge errors
2017-12-13 18:28:52 -05:00
Alan Rominger
7eb2d86890
Merge pull request #749 from AlanCoding/detail_opt
...
Apply list view optimizations to detail view
2017-12-13 18:19:00 -05:00
Matthew Jones
2fb0144914
Add libcurl-devel to official image build
2017-12-13 16:14:55 -05:00
AlanCoding
e3a731bb9e
apply listview optimizations to detail view
2017-12-13 16:09:37 -05:00
Ryan Petrello
451e9a7504
Merge pull request #826 from AlanCoding/322flake
...
flake8 fixes from removal of re-encrypt test
2017-12-13 15:23:41 -05:00
Ryan Petrello
8311acfba2
Merge pull request #825 from AlanCoding/towervars
...
Add back in support of towervars lost in merge
2017-12-13 15:19:47 -05:00
AlanCoding
77a1c405a6
flake8 fixes from removal of reencrypt test
2017-12-13 14:32:34 -05:00
AlanCoding
1b0bca8229
add back in support of towervars lost in merge
2017-12-13 14:30:11 -05:00
Ryan Petrello
bd91e8eb54
Merge pull request #824 from ryanpetrello/devel
...
fix a few tests caused by fallout between 3.2.2 bugs and 3.3 multicred
2017-12-13 14:10:39 -05:00
Ryan Petrello
ea4cd99003
fix a few tests caused by fallout between 3.2.2 bugs and 3.3 multicred
2017-12-13 14:02:25 -05:00
Shane McDonald
00ce244716
Merge pull request #822 from jakemcdermott/fix-merge-issues
...
fix merge issue with inventory source service
2017-12-13 13:32:13 -05:00
Jake McDermott
3b791609cd
fix merge issue with inventory source service
2017-12-13 13:23:15 -05:00
Matthew Jones
a8d4eb7c1d
Merge pull request #821 from ryanpetrello/devel
...
more test cleanup from 3.2.2 merge
2017-12-13 13:15:59 -05:00
Ryan Petrello
d35bfafcf5
more test cleanup from 3.2.2 merge
2017-12-13 13:14:22 -05:00
Ryan Petrello
9f8ef4d1e5
Merge pull request #820 from ryanpetrello/devel
...
fix a number of failing unit tests related to the 3.2.2 merge
2017-12-13 13:04:55 -05:00
Ryan Petrello
a978d094b4
fix a number of failing unit tests related to the 3.2.2 merge
2017-12-13 13:03:17 -05:00
Shane McDonald
47e422ba7a
Merge pull request #819 from ansible/jakemcdermott-patch-1
...
fix arg name clash in hosts list controller
2017-12-13 13:02:47 -05:00
Jake McDermott
4b86815275
fix arg name clash in hosts list controller
2017-12-13 13:01:11 -05:00
Alan Rominger
6c1c850c5f
Merge pull request #816 from AlanCoding/ints
...
use credential property that returns integers
2017-12-13 12:56:07 -05:00
AlanCoding
f4f1e0fd3c
use credential property that returns integers
2017-12-13 12:54:32 -05:00
Matthew Jones
ca84e1c654
Merge pull request #817 from ansible/jakemcdermott-patch-1
...
fix missing comma in package.json
2017-12-13 12:48:16 -05:00
Jake McDermott
6b6e898882
fix missing comma in package.json
2017-12-13 12:45:26 -05:00
Matthew Jones
9dbcc5934e
Merge remote-tracking branch 'tower/release_3.2.2' into devel
2017-12-13 12:25:47 -05:00
