diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-02-07 16:44:54 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-02-07 16:44:54 +0000 |
| commit | f7d900aa42f01bf24f35162aa042a0725a6b8bdc (patch) | |
| tree | 9fe0400b3d941cc2b908c42d6543b06f5bc78211 /spec/javascripts | |
| parent | a658654c695b81b2b8a28af01b273e6e3db08184 (diff) | |
| parent | 0886b0fe98c640579fa1e4e88a28c9a62b866f2a (diff) | |
| download | gitlab-ce-f7d900aa42f01bf24f35162aa042a0725a6b8bdc.tar.gz | |
Merge branch '24147-delete-env-button' into 'master'
Makes stop button visible in environment page
Closes #24147
See merge request !7379
Diffstat (limited to 'spec/javascripts')
| -rw-r--r-- | spec/javascripts/environments/environment_item_spec.js.es6 | 2 | ||||
| -rw-r--r-- | spec/javascripts/environments/mock_data.js.es6 | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/spec/javascripts/environments/environment_item_spec.js.es6 b/spec/javascripts/environments/environment_item_spec.js.es6 index 9858f346c83..d87cc0996c9 100644 --- a/spec/javascripts/environments/environment_item_spec.js.es6 +++ b/spec/javascripts/environments/environment_item_spec.js.es6 @@ -119,7 +119,7 @@ describe('Environment item', () => { }, ], }, - 'stoppable?': true, + 'stop_action?': true, environment_path: 'root/ci-folders/environments/31', created_at: '2016-11-07T11:11:16.525Z', updated_at: '2016-11-10T15:55:58.778Z', diff --git a/spec/javascripts/environments/mock_data.js.es6 b/spec/javascripts/environments/mock_data.js.es6 index 58f6fb96afb..80e1cbc6f4d 100644 --- a/spec/javascripts/environments/mock_data.js.es6 +++ b/spec/javascripts/environments/mock_data.js.es6 @@ -50,7 +50,7 @@ const environmentsList = [ }, manual_actions: [], }, - 'stoppable?': true, + 'stop_action?': true, environment_path: '/root/ci-folders/environments/31', created_at: '2016-11-07T11:11:16.525Z', updated_at: '2016-11-07T11:11:16.525Z', @@ -105,7 +105,7 @@ const environmentsList = [ }, manual_actions: [], }, - 'stoppable?': false, + 'stop_action?': false, environment_path: '/root/ci-folders/environments/31', created_at: '2016-11-07T11:11:16.525Z', updated_at: '2016-11-07T11:11:16.525Z', @@ -116,7 +116,7 @@ const environmentsList = [ state: 'available', environment_type: 'review', last_deployment: null, - 'stoppable?': true, + 'stop_action?': true, environment_path: '/root/ci-folders/environments/31', created_at: '2016-11-07T11:11:16.525Z', updated_at: '2016-11-07T11:11:16.525Z', @@ -127,7 +127,7 @@ const environmentsList = [ state: 'available', environment_type: 'review', last_deployment: null, - 'stoppable?': true, + 'stop_action?': true, environment_path: '/root/ci-folders/environments/31', created_at: '2016-11-07T11:11:16.525Z', updated_at: '2016-11-07T11:11:16.525Z', @@ -143,7 +143,7 @@ const environment = { external_url: 'http://production.', environment_type: null, last_deployment: {}, - 'stoppable?': false, + 'stop_action?': false, environment_path: '/root/review-app/environments/4', stop_path: '/root/review-app/environments/4/stop', created_at: '2016-12-16T11:51:04.690Z', |