diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-04-06 15:44:21 -0500 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-04-06 15:44:21 -0500 |
| commit | 57d6346b7c0abcd5498f170f5d7d65b1bf77882f (patch) | |
| tree | cecf5fe859c142f9b0748a1b158f62d7a2de9ba6 | |
| parent | 00e00cacf8cb4ce3bfb733bae47e7e594e91e294 (diff) | |
| download | gitlab-ce-metrics-button-misplaced.tar.gz | |
Moved the monitoring button inside the show view for the environments pagemetrics-button-misplaced
| -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: |