diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-10 17:55:39 +0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-11-10 22:25:22 +0300 |
| commit | 98baa929de998869095660474da0a89345d70993 (patch) | |
| tree | 0255284124bcb20d612c85a6d12a8c6f4ecc8a78 /changelogs | |
| parent | 2758c79e198b87024b1e857f64e76709aceb4bd2 (diff) | |
Merge branch 'issue_39773_be' into 'master'
Prevent fast forward merge when rebase is required
Closes #39773
See merge request gitlab-org/gitlab-ce!15296
(cherry picked from commit f7537ce03a29b1af85461b2883c33bb41b2382d5)
bddbb90f Prevent fast forward merge when rebase is required
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/issue_39773_be.yml | 5 |
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 |