diff options
author | Douwe Maan <douwe@gitlab.com> | 2019-03-07 11:27:52 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2019-03-07 11:27:52 +0000 |
commit | c45bb62c0ae36018891a343c7c820fc1a901e33e (patch) | |
tree | f5a9cb739ab4ed509d66947bbf9581906310e271 /changelogs | |
parent | e571cbaa2f0b5096e514bc96fbc8f26909d8e52b (diff) | |
parent | 2cb45dd0d56156ace389239088822c428d87585c (diff) | |
download | gitlab-ce-c45bb62c0ae36018891a343c7c820fc1a901e33e.tar.gz |
Merge branch 'osw-merge-to-ref-changes-for-ci-team' into 'master'
Make merge to refs/merge-requests/:iid/merge not raise when FF-only enabled
Closes #58393
See merge request gitlab-org/gitlab-ce!25653
Diffstat (limited to 'changelogs')
-rw-r--r-- | changelogs/unreleased/osw-merge-to-ref-changes-for-ci-team.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/osw-merge-to-ref-changes-for-ci-team.yml b/changelogs/unreleased/osw-merge-to-ref-changes-for-ci-team.yml new file mode 100644 index 00000000000..dfccd6194d4 --- /dev/null +++ b/changelogs/unreleased/osw-merge-to-ref-changes-for-ci-team.yml @@ -0,0 +1,5 @@ +--- +title: Make merge to refs/merge-requests/:iid/merge not raise when FF-only enabled +merge_request: 25653 +author: +type: fixed |