diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-07-16 09:56:19 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-07-16 09:56:19 +0000 |
| commit | 6c237350b3967881cf9da50ec13a536e1a7e6755 (patch) | |
| tree | 8ce3d51df9ce9e9716ef3ce8626b973d7f882547 /app/views | |
| parent | f73fb2444985155c5bbec4fc43de9fbfb6710825 (diff) | |
| parent | af00a1591412655202a634fbca999b80b97a676e (diff) | |
| download | gitlab-ce-6c237350b3967881cf9da50ec13a536e1a7e6755.tar.gz | |
Merge branch 'fix/gb/rename-environments-stop-actions' into 'master'
Make it more explicit what environment stop actions are
Closes #48672
See merge request gitlab-org/gitlab-ce!20587
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/environments/show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/environments/show.html.haml b/app/views/projects/environments/show.html.haml index a33bc9d4ce6..c7890b37381 100644 --- a/app/views/projects/environments/show.html.haml +++ b/app/views/projects/environments/show.html.haml @@ -16,7 +16,7 @@ ? .modal-body %p= s_('Environments|Are you sure you want to stop this environment?') - - unless @environment.stop_action? + - unless @environment.stop_action_available? .warning_message %p= s_('Environments|Note that this action will stop the environment, but it will %{emphasis_start}not%{emphasis_end} have an effect on any existing deployment due to no “stop environment action” being defined in the %{ci_config_link_start}.gitlab-ci.yml%{ci_config_link_end} file.').html_safe % { emphasis_start: '<strong>'.html_safe, emphasis_end: '</strong>'.html_safe, |