Shane McDonald
6f39995060
Fix docker-compose error
...
Fixes this error:
```
ERROR: yaml.parser.ParserError: while parsing a block mapping
in "./tools/docker-compose/unit-tests/docker-compose.yml", line 10, column 7
expected <block end>, but found '<scalar>'
in "./tools/docker-compose/unit-tests/docker-compose.yml", line 11, column 40
```
2016-11-10 13:38:15 -05:00
Shane McDonald
f0dad06032
.dockerignore
2016-11-10 13:12:29 -05:00
Shane McDonald
cc359ecbad
Default TEST_DIRS in docker-compose
2016-11-10 13:12:29 -05:00
jaredevantabor
9f7ac059b7
Small fix for projects list to update on successful websocket messages
2016-11-10 13:10:22 -05:00
Matthew Jones
30984a3a79
Fix up flake8 errors
2016-11-10 13:07:48 -05:00
Alan Rominger
75c364930f
Merge pull request #3932 from AlanCoding/rbac_related_fixes
...
Quick RBAC check_related fixes
2016-11-10 12:20:42 -05:00
Matthew Jones
1a3d452a2d
Fix an auth issue in the browsable api
...
Trying to get the object could raise an unhandleable permission error if
the user wasn't logged in for certain views
2016-11-10 11:46:25 -05:00
Matthew Jones
5186e7d8b4
Remove some unneeded func tests for instances
2016-11-10 11:46:25 -05:00
Jared Tabor
27ddb7392b
Merge pull request #3941 from jaredevantabor/jobs-page-fix
...
Jobs page fix
2016-11-10 11:37:22 -05:00
jaredevantabor
740daba640
Merge branch 'devel' of https://github.com/ansible/ansible-tower into devel
2016-11-10 11:35:00 -05:00
jaredevantabor
b3dbc59df6
Fixing jobs list page: adding launch & cancel buttons
...
and making sure that you can launch jobs from the jobs list, and that sockets
work with the jobs list for live updates
2016-11-10 11:34:06 -05:00
Chris Meyers
9aaf694acf
always allow running at least 1 job
...
* Regardless of capacity
* Add unit tests around this logic
2016-11-10 11:07:05 -05:00
Aaron Tan
ece29737ac
Merge pull request #3915 from jangsutsr/3516_implement_workflow_notifications
...
Implement workflow notifications
2016-11-10 11:05:02 -05:00
Matthew Jones
78b8876ed9
Support expiring of capacity if a node is down
...
For a certain amount of time
2016-11-10 09:52:04 -05:00
Chris Meyers
2672846ad2
Merge pull request #3934 from chrismeyersfsu/deps_3.1-bump
...
Deps 3.1 bump
2016-11-10 09:40:07 -05:00
Chris Meyers
697ff11e3b
move python dep git repos to ansible org
2016-11-10 09:27:44 -05:00
Chris Meyers
b9462bfad6
remove, not used, gevent-socketio
2016-11-10 09:10:26 -05:00
Chris Meyers
5d205f1e1b
remove deprecated mongo fact code and deps
...
* We have the requirements that users with Tower < 3.0.x must upgrade to
3.0.x before > 3.0.x. Thus, we are save to delete all mongo migration
code and deps.
2016-11-09 16:25:27 -05:00
Graham Mainwaring
313a8a7d67
Merge pull request #3933 from ghjm/deb_nginx_2
...
Fix uwsgi and daphne bin install
2016-11-09 16:20:30 -05:00
Chris Meyers
766e4af38e
low hanging fruit requirements spring cleaning
...
* django-jsonfield PR accepted upstream
* django-rest-framework-mongoengine legacy system tracking dep
* python-social-auth PR accepted upstream
2016-11-09 16:12:27 -05:00
kensible
d4d3c8117f
Merge pull request #3922 from kensible/3921-pre-pr-issues
...
Pre-pr fix and ui-router update
2016-11-09 15:46:45 -05:00
AlanCoding
2c9cf0f6d6
fixes for RBAC bugs from check_related
2016-11-09 15:38:09 -05:00
Aaron Tan
c1419a799d
Enhance notification text.
2016-11-09 14:15:29 -05:00
Leigh Johnson
0d3eb67bd0
Fixes namespace collision & allows command-line options to be passed to UI build system ( #3876 )
...
* Fixes BrowserSync window.name namespace collision #3872
* Allow command-line arguments to be passed to development UI builds.
Add support for --ng-debug and --router-debug flags to turn on Angular's
$log service and ui-router's trace utility.
Cleans up development debug settings & defunct websocket configuration.
Resolves lingering issues raised by trying read asynchronously-loaded config file during AngularJS config phase. #3872
* shrinkwrap updated minimist
* update CONTRIBUTING.md to include UI build options
* feedback/review
2016-11-09 12:49:18 -05:00
Shane McDonald
fe24d0fe0f
Merge pull request #3920 from shanemcd/bubblewrap-ppa
...
Bubblewrap ppa
2016-11-09 11:52:09 -05:00
Leigh Johnson
3706cc9337
Switch Grunt jshint to stdout output #3845
2016-11-09 11:41:09 -05:00
Ken Hoes
a071ca7173
Pre-pr fix and ui-router update
2016-11-09 10:31:05 -05:00
Leigh Johnson
38e40c7eba
Hook up npm script target for jshint ( #3916 )
...
* Hook up npm script target for jshint
* Shrinkwrap ui dependencies
2016-11-09 09:53:58 -05:00
Aaron Tan
de6e25d4aa
Custom notification body.
2016-11-08 20:02:43 -05:00
Aaron Tan
cdbc5127a6
Workflow notification backend.
2016-11-08 15:55:15 -05:00
Aaron Tan
5c5d1b7748
Enable notification endpoints.
2016-11-08 15:53:37 -05:00
Chris Meyers
930b3651a0
Merge pull request #3917 from chrismeyersfsu/task-manager_prov_callback_inv_sync_dedup
...
on host callback, upate dynamic inv only once
2016-11-08 15:45:38 -05:00
Chris Meyers
adcf0af2a0
on host callback, upate dynamic inv only once
...
* During a job template launch via the host callback launch feature,
when the host launching the job template is not found; we try to launch
associated dyn inv updates to pick up the host. Then the inv is searched
again for the host. If the host is found, then the jt is launched. This
fix carries forward the feature that prevents the dyn inv update with
cache timeout of 0 from being re-launched with the new task manager.
2016-11-08 15:06:47 -05:00
Alan Rominger
78acab168c
Merge pull request #3899 from AlanCoding/wf_survey
...
Workflow surveys
2016-11-08 14:17:11 -05:00
AlanCoding
105175b6b4
Fix errors in workflow surveys found through tests
2016-11-08 13:51:29 -05:00
AlanCoding
a1c17a7243
Fix issue where unified_job method overrode the SurveyMixin methods
2016-11-08 13:39:11 -05:00
AlanCoding
76eb0bb866
bump workflow survey migration number
2016-11-08 13:39:10 -05:00
AlanCoding
7f41f16509
passwords in WFJT surveys working correctly
2016-11-08 13:39:10 -05:00
AlanCoding
a87a56f518
workflow JT survey and launch serializer in functional state
2016-11-08 13:39:10 -05:00
AlanCoding
64b5e2ba5b
bump migration
2016-11-08 13:39:10 -05:00
AlanCoding
1bd8bd245b
bump migrations, and enable survey license check
2016-11-08 13:39:09 -05:00
AlanCoding
8ff671bfd6
finish editing the WFJT launch validate method
2016-11-08 13:39:09 -05:00
AlanCoding
9b7d046cec
move job tests to new survey testing file
2016-11-08 13:39:09 -05:00
AlanCoding
21c6dd6b1e
move survey models to mixins, start WFJT launch endpoint
2016-11-08 13:39:09 -05:00
AlanCoding
020144d1ee
add surveys on workflow models
2016-11-08 13:39:08 -05:00
Aaron Tan
05790c5b5c
Merge pull request #3848 from jangsutsr/3528_workflow_job_cancel_endpoint
...
Implement workflow job cancel endpoint
2016-11-08 12:16:39 -05:00
Aaron Tan
a8a3835308
Apply immediate reschedule.
2016-11-08 11:54:06 -05:00
Chris Meyers
2d3ab2b796
Merge pull request #3914 from chrismeyersfsu/fix-test_settings
...
fixes test_settings unit tests
2016-11-08 11:39:58 -05:00
Chris Meyers
258fd52ef2
Merge pull request #3912 from chrismeyersfsu/bug-allow_simulataneous
...
fix job blocking job with allow simultaneous
2016-11-08 11:39:23 -05:00
Aaron Tan
9e244b640b
Simplify internal node job cancel mechanism.
2016-11-08 11:32:33 -05:00