diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-05-31 12:07:12 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-05-31 12:07:12 +0300 |
| commit | 20047e72d814e1d5fd744a0eda843019eb4e0b3f (patch) | |
| tree | 5702eeb09992a811c345381992748a06bef3b402 /app/views | |
| parent | f8eb8feae3aa146c41433308abd2e184d73688e5 (diff) | |
Fix environment specs related to protected actions
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/deployments/_actions.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/environments/show.html.haml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/deployments/_actions.haml b/app/views/projects/deployments/_actions.haml index 506246f2ee6..e2baaa625ae 100644 --- a/app/views/projects/deployments/_actions.haml +++ b/app/views/projects/deployments/_actions.haml @@ -8,6 +8,7 @@ = icon('caret-down') %ul.dropdown-menu.dropdown-menu-align-right - actions.each do |action| + - next unless can?(current_user, :update_build, action) %li = link_to [:play, @project.namespace.becomes(Namespace), @project, action], method: :post, rel: 'nofollow' do = custom_icon('icon_play') diff --git a/app/views/projects/environments/show.html.haml b/app/views/projects/environments/show.html.haml index 7315e671056..9e221240cf2 100644 --- a/app/views/projects/environments/show.html.haml +++ b/app/views/projects/environments/show.html.haml @@ -13,7 +13,7 @@ = render 'projects/environments/metrics_button', environment: @environment - if can?(current_user, :update_environment, @environment) = link_to 'Edit', edit_namespace_project_environment_path(@project.namespace, @project, @environment), class: 'btn' - - if can?(current_user, :create_deployment, @environment) && @environment.can_stop? + - if can?(current_user, :stop_environment, @environment) = link_to 'Stop', stop_namespace_project_environment_path(@project.namespace, @project, @environment), data: { confirm: 'Are you sure you want to stop this environment?' }, class: 'btn btn-danger', method: :post .environments-container |