diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-07 14:26:43 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-07 14:26:43 +0000 |
| commit | 37e7fe2cc90de24c563fe70e4eff6f5d954bb630 (patch) | |
| tree | ad3a0164a99dc1c20d042bf99f43e7ad46303f49 | |
| parent | 052d200cd03b2f0a50a2ca79ff0f6f82bbffbe29 (diff) | |
| parent | 57d6346b7c0abcd5498f170f5d7d65b1bf77882f (diff) | |
| download | gitlab-ce-37e7fe2cc90de24c563fe70e4eff6f5d954bb630.tar.gz | |
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
| -rw-r--r-- | app/views/projects/environments/show.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/metrics-button-misplaced.yml | 4 |
2 files changed, 5 insertions, 1 deletions
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: |