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
This commit is contained in:
Annabel Dunstone Gray 2017-04-07 14:26:43 +00:00
commit 37e7fe2cc9
2 changed files with 5 additions and 1 deletions

View file

@ -8,9 +8,9 @@
%h3.page-title= @environment.name
.col-md-5
.nav-controls
= render 'projects/environments/metrics_button', environment: @environment
= render 'projects/environments/terminal_button', environment: @environment
= render 'projects/environments/external_url', environment: @environment
= 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?

View file

@ -0,0 +1,4 @@
---
title: Moved the monitoring button inside the show view for the environments page
merge_request:
author: