summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrpereira2 <rpereira@gitlab.com>2019-06-26 11:19:36 +0530
committerrpereira2 <rpereira@gitlab.com>2019-06-26 11:37:13 +0530
commit79c471c2cb06557e27cf6bda19da76a0899bc5d1 (patch)
tree26ebcfe20daa2aefcdd641990b6f57704ad60aa9
parentf67c220f02d5c77783e6c57964ce989c20de7c56 (diff)
downloadgitlab-ce-always-display-environment-selector.tar.gz
Combine 2 changelogs into 1always-display-environment-selector
-rw-r--r--changelogs/unreleased/63341-fix-environment-selector.yml5
-rw-r--r--changelogs/unreleased/always-display-environment-selector.yml2
2 files changed, 1 insertions, 6 deletions
diff --git a/changelogs/unreleased/63341-fix-environment-selector.yml b/changelogs/unreleased/63341-fix-environment-selector.yml
deleted file mode 100644
index 6a32ae308de..00000000000
--- a/changelogs/unreleased/63341-fix-environment-selector.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix broken environment selector on Monitoring dashboard
-merge_request: 29754
-author:
-type: fixed
diff --git a/changelogs/unreleased/always-display-environment-selector.yml b/changelogs/unreleased/always-display-environment-selector.yml
index 7176a2c448d..7a55e8f3e5d 100644
--- a/changelogs/unreleased/always-display-environment-selector.yml
+++ b/changelogs/unreleased/always-display-environment-selector.yml
@@ -1,5 +1,5 @@
---
-title: Always display environment selector on monitoring dashboard
+title: Fix broken environment selector and always display it on monitoring dashboard
merge_request: 29705
author:
type: fixed