summaryrefslogtreecommitdiff
path: root/changelogs/unreleased
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2019-04-26 08:30:59 +0000
committerFilipa Lacerda <filipa@gitlab.com>2019-04-26 08:30:59 +0000
commitd1ac44ae96468c571ba153cd79d1760c78524894 (patch)
treefae9d2886545ac82a0a3aff9a4ab7295ec226f4c /changelogs/unreleased
parentc1d93721e04f37d0cf188fe4c1c9cd1eeb482b07 (diff)
parentca6e946f0f50d997ecad7d3758fe362cf0fae5ce (diff)
downloadgitlab-ce-d1ac44ae96468c571ba153cd79d1760c78524894.tar.gz
Merge branch '60808-only-show-target-branch-advanced-error-before-merge' into 'master'
Don't show the "target branch advanced" error message after merge Closes #60808 See merge request gitlab-org/gitlab-ce!27588
Diffstat (limited to 'changelogs/unreleased')
-rw-r--r--changelogs/unreleased/60808-only-show-target-branch-advanced-error-before-merge.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/changelogs/unreleased/60808-only-show-target-branch-advanced-error-before-merge.yml b/changelogs/unreleased/60808-only-show-target-branch-advanced-error-before-merge.yml
new file mode 100644
index 00000000000..b340f8408f3
--- /dev/null
+++ b/changelogs/unreleased/60808-only-show-target-branch-advanced-error-before-merge.yml
@@ -0,0 +1,6 @@
+---
+title: Only show the "target branch has advanced" message when the merge request is
+ open
+merge_request: 27588
+author:
+type: fixed