diff options
| author | Luke Duncalfe <lduncalfe@gitlab.com> | 2019-03-07 21:11:28 +0000 |
|---|---|---|
| committer | Luke Duncalfe <lduncalfe@eml.cc> | 2019-03-08 11:07:48 +1300 |
| commit | 33205b08c9a425c8338a8292fa0b389db355c7a6 (patch) | |
| tree | 96e6d3d293812d59876780bc9e7b1f42a03a9070 /changelogs | |
| parent | 1de36fd2eef900a93606e1c0558f736ad88717cd (diff) | |
| download | gitlab-ce-33205b08c9a425c8338a8292fa0b389db355c7a6.tar.gz | |
Revert "Merge branch 'sh-show-pre-receive-error-merge' into 'master'"
This reverts merge request !25708
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/sh-show-pre-receive-error-merge.yml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/changelogs/unreleased/sh-show-pre-receive-error-merge.yml b/changelogs/unreleased/sh-show-pre-receive-error-merge.yml deleted file mode 100644 index 5e662b34773..00000000000 --- a/changelogs/unreleased/sh-show-pre-receive-error-merge.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Show pre-receive error message when merge fails -merge_request: 25708 -author: -type: fixed |