summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2017-11-09 14:55:45 -0200
committerFelipe Artur <felipefac@gmail.com>2017-11-10 12:01:09 -0200
commitbddbb90fd985df50d4b17d0728ef5fa90bf64af7 (patch)
tree066c1bf6adca984b1a47800d7a5ad78d617ca2ac /changelogs
parent65faebb95556809c5858347f1c24422505056827 (diff)
downloadgitlab-ce-bddbb90fd985df50d4b17d0728ef5fa90bf64af7.tar.gz
Prevent fast forward merge when rebase is requiredissue_39773_be
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/issue_39773_be.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/issue_39773_be.yml b/changelogs/unreleased/issue_39773_be.yml
new file mode 100644
index 00000000000..db30267d71f
--- /dev/null
+++ b/changelogs/unreleased/issue_39773_be.yml
@@ -0,0 +1,5 @@
+---
+title: Show error message when fast-forward merge is not possible
+merge_request:
+author:
+type: fixed