Commit 37e7fe2c authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch 'metrics-button-misplaced' into 'master'

Moved the monitoring button inside the show view for the environments page

Closes #30463

See merge request !10514
parents 052d200c 57d6346b
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
%h3.page-title= @environment.name %h3.page-title= @environment.name
.col-md-5 .col-md-5
.nav-controls .nav-controls
= render 'projects/environments/metrics_button', environment: @environment
= render 'projects/environments/terminal_button', environment: @environment = render 'projects/environments/terminal_button', environment: @environment
= render 'projects/environments/external_url', environment: @environment = render 'projects/environments/external_url', environment: @environment
= render 'projects/environments/metrics_button', environment: @environment
- if can?(current_user, :update_environment, @environment) - if can?(current_user, :update_environment, @environment)
= link_to 'Edit', edit_namespace_project_environment_path(@project.namespace, @project, @environment), class: 'btn' = 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, :create_deployment, @environment) && @environment.can_stop?
......
---
title: Moved the monitoring button inside the show view for the environments page
merge_request:
author:
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment