diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-19 16:36:22 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-19 16:36:22 +0000 |
commit | 364050c1f1387170fc70128dd2eec570cba89999 (patch) | |
tree | 0ef689583e029603a5282594d68169178b0c66cb | |
parent | 29ddc15f8d9b094bb7052875f7728ee48f7ad06b (diff) | |
parent | 51eb2a81a8947638d5499993ac3786463c70b981 (diff) | |
download | gitlab-ce-364050c1f1387170fc70128dd2eec570cba89999.tar.gz |
Merge branch '29734-prometheus-monitoring-page-displays-button-to-control-manual-actions' into 'master'
Remove manual deployment controls from Environment metrics page
Closes #29734
See merge request !10769
-rw-r--r-- | app/views/projects/environments/metrics.html.haml | 3 | ||||
-rw-r--r-- | changelogs/unreleased/29734-prometheus-monitoring-page-displays-button-to-control-manual-actions.yml | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/views/projects/environments/metrics.html.haml b/app/views/projects/environments/metrics.html.haml index 2e54af698aa..766f119116f 100644 --- a/app/views/projects/environments/metrics.html.haml +++ b/app/views/projects/environments/metrics.html.haml @@ -13,9 +13,6 @@ Environment: = link_to @environment.name, environment_path(@environment) - .col-sm-6 - .nav-controls - = render 'projects/deployments/actions', deployment: @environment.last_deployment .prometheus-state .js-getting-started.hidden .row diff --git a/changelogs/unreleased/29734-prometheus-monitoring-page-displays-button-to-control-manual-actions.yml b/changelogs/unreleased/29734-prometheus-monitoring-page-displays-button-to-control-manual-actions.yml new file mode 100644 index 00000000000..ca4a8889454 --- /dev/null +++ b/changelogs/unreleased/29734-prometheus-monitoring-page-displays-button-to-control-manual-actions.yml @@ -0,0 +1,4 @@ +--- +title: Remove pipeline controls for last deployment from Environment monitoring page +merge_request: 10769 +author: |