From 57d6346b7c0abcd5498f170f5d7d65b1bf77882f Mon Sep 17 00:00:00 2001 From: Jose Ivan Vargas Date: Thu, 6 Apr 2017 15:44:21 -0500 Subject: [PATCH] Moved the monitoring button inside the show view for the environments page --- app/views/projects/environments/show.html.haml | 2 +- changelogs/unreleased/metrics-button-misplaced.yml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/metrics-button-misplaced.yml diff --git a/app/views/projects/environments/show.html.haml b/app/views/projects/environments/show.html.haml index ff6aaebda22..7315e671056 100644 --- a/app/views/projects/environments/show.html.haml +++ b/app/views/projects/environments/show.html.haml @@ -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? diff --git a/changelogs/unreleased/metrics-button-misplaced.yml b/changelogs/unreleased/metrics-button-misplaced.yml new file mode 100644 index 00000000000..6c685ff32a5 --- /dev/null +++ b/changelogs/unreleased/metrics-button-misplaced.yml @@ -0,0 +1,4 @@ +--- +title: Moved the monitoring button inside the show view for the environments page +merge_request: +author: