Chris Church
e22b0f75b8
Fix social auth callback URLs to depend on TOWER_URL_BASE so they are updated when it changes.
2016-11-15 00:58:33 -05:00
Alan Rominger
f5d3e1885e
Merge pull request #4003 from AlanCoding/test_fix
...
Change ordering of test dirs
2016-11-14 18:08:31 -05:00
AlanCoding
8f3e3c4ae1
change ordering of test dirs
2016-11-14 17:50:10 -05:00
Alan Rominger
731420a834
Merge pull request #3992 from AlanCoding/jsonfd_monkey
...
New method to monkeypatch JSONField
2016-11-14 17:12:47 -05:00
AlanCoding
339661a6a5
New method to monkeypatch JSONField
2016-11-14 16:35:56 -05:00
Chris Meyers
9f40e7ef70
fix notification unit test mock
2016-11-14 16:29:34 -05:00
jaredevantabor
fb7be12110
Removing stale pendo file
...
a working version of this file exists in a directory above this file already
2016-11-14 12:42:11 -08:00
Chris Meyers
f1f92deb1f
bump up django-jsonfield
2016-11-14 14:34:46 -05:00
Chris Meyers
0c2d9e09b9
use known working django-jsonfield
2016-11-14 13:26:24 -05:00
jaredevantabor
1b79503075
making workflow-results panels the height of the viewport
2016-11-14 10:00:22 -08:00
Chris Meyers
ec83a1cb47
use django-jsonfield not jsonfield
2016-11-14 12:18:29 -05:00
Chris Meyers
356b0af3cd
bump channels version
2016-11-14 11:11:29 -05:00
Chris Meyers
1d513252e4
fix up requirements
2016-11-14 09:16:26 -05:00
Chris Meyers
545412a6b5
remove inline requirements comment
2016-11-14 08:46:46 -05:00
Chris Meyers
c95ef4dc07
add requirements unit test
2016-11-11 17:19:52 -05:00
Michael Abashian
887afb79f8
Merge pull request #3978 from mabashian/3528-workflow-launch-transition
...
Transition the user to the workflow details view after launch
2016-11-11 16:16:39 -05:00
Leigh Johnson
649dbef47d
Initialize empty global.$ENV in RC builds, resolves #3940 ( #3981 )
2016-11-11 16:15:23 -05:00
Chris Meyers
3d4f359cbc
Revert "Read the branch name"
...
This reverts commit e38bfbce6adc0e94a72bd3eda908263aa6cc651a.
2016-11-11 16:01:45 -05:00
Chris Meyers
5f10c849fa
Read the branch name
2016-11-11 16:00:53 -05:00
Shane McDonald
933ae7d0ab
Merge pull request #3975 from ansible/unit-test-base-image
...
Use tower_devel as base image for unit tests
2016-11-11 16:00:04 -05:00
Michael Abashian
392ee19290
Transition the user to the workflow details view after launch
2016-11-11 15:56:45 -05:00
Chris Meyers
241019568c
use jsonfield instead of django-jsonfield
2016-11-11 15:47:41 -05:00
Shane McDonald
30e5904ab3
Use tower_devel as base image for unit tests
2016-11-11 15:47:17 -05:00
Alan Rominger
1885ca0adc
Merge pull request #3974 from AlanCoding/notification_test
...
Avoid using serialized notification configuraiton
2016-11-11 15:32:15 -05:00
AlanCoding
059345e330
avoid reading notification configuration from already-serialized data
2016-11-11 15:23:49 -05:00
Chris Meyers
5b4892250d
fix partial test
...
* We shouldn't care what order the inventory updates for the inventory
sources are returned in.
2016-11-11 15:13:28 -05:00
Chris Meyers
0efe8e9cfb
fix license test
...
so that the license file on dev machines isn't accidentally picked up
2016-11-11 14:43:00 -05:00
Shane McDonald
5657671fb9
Add unit test artifacts to clean target
2016-11-11 14:39:23 -05:00
Alan Rominger
e7d9fe0204
Merge pull request #3951 from AlanCoding/label_test_fix
...
Environment specific label test failure fix
2016-11-11 12:52:50 -05:00
Alan Rominger
93f68ad0e2
Merge pull request #3956 from AlanCoding/spec_update
...
Change survey_spec validation to work with newer JSONField
2016-11-11 12:52:38 -05:00
Michael Abashian
b08a8a7997
Quick fix to get adding inventory source nodes working within workflows
2016-11-11 11:43:34 -05:00
Michael Abashian
b9927edccd
Merge pull request #3955 from mabashian/jshint-fixes
...
Fixed lingering jshint errors
2016-11-11 11:37:21 -05:00
AlanCoding
d105414708
change survey_spec validation to work with newer JSONField
2016-11-11 10:59:51 -05:00
Michael Abashian
88fb6ca4af
Fixed lingering jshint errors
2016-11-11 10:40:41 -05:00
Leigh Johnson
53760be4ae
Update job_template param naming. Fixes error thrown on transition from job template add => edit state. @NoIssue
2016-11-11 10:31:45 -05:00
Michael Abashian
99eb7ff02b
Merge pull request #3931 from mabashian/workflows-branched-s3
...
Add/Edit Workflows with smart search integration
2016-11-11 09:51:50 -05:00
AlanCoding
15558aac08
environment specific label test failure fix
2016-11-11 09:40:35 -05:00
Michael Abashian
92840b2752
Fixed broken templates name link. It should now appropriately redirect the user to the edit JT/WFJT page
2016-11-10 18:17:05 -05:00
Michael Abashian
44625b4a76
Turn smart status back on. This will throw a js error for workflow rows until recent_jobs are added as a summary_field to workflows
2016-11-10 18:03:35 -05:00
Michael Abashian
caa773020c
Pulled in the colors css files so that I can use @color-names instead of hex
2016-11-10 17:51:51 -05:00
Michael Abashian
c3a3b2662e
Internationalized workflow related forms
2016-11-10 17:43:41 -05:00
Michael Abashian
ca32c34036
Added a lot of permissions related logic to the workflow form as well as the workflow maker. I know it's not perfect but its a step in the right direction.
2016-11-10 16:44:11 -05:00
Shane McDonald
8c4872836e
Fix pyc errors when running tests
2016-11-10 16:20:12 -05:00
Leigh Johnson
fb991bc74b
Remove defunct .bowerrc
2016-11-10 16:09:43 -05:00
Graham Mainwaring
6f50a450af
Merge pull request #3943 from ghjm/devel
...
Remove obsolete script
2016-11-10 14:54:35 -05:00
Graham Mainwaring
a9e46e2720
Remove obsolete script
2016-11-10 13:38:58 -05:00
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
