diff options
| author | Chris Wilson <chris@chrisjwilson.com> | 2017-04-24 16:53:43 +1000 |
|---|---|---|
| committer | Chris Wilson <chris@chrisjwilson.com> | 2017-04-24 20:51:05 +1000 |
| commit | e670cb271ed61cde68a932ce911553d7c8e4a6d5 (patch) | |
| tree | f18345c0787cadb8e72de528114b3a63c2d6688a /changelogs/unreleased | |
| parent | c768026474b9dff9f6f988372e4eefb85b1d8be9 (diff) | |
| download | gitlab-ce-e670cb271ed61cde68a932ce911553d7c8e4a6d5.tar.gz | |
Fix updating merge_when_build_succeeds via merge API endpointmrchrisw-22740-merge-api
When updating a merge request via the `/merge` endpoint we
check the `mergeable` and `mergeable_state` status, these will return
`false` if the application option only_allow_merge_if_pipeline_succeeds is
enabled. We should skip CI checks if the request uses the
merge_when_pipeline_succeeds param
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22740
Diffstat (limited to 'changelogs/unreleased')
| -rw-r--r-- | changelogs/unreleased/mrchrisw-22740-merge-api.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/mrchrisw-22740-merge-api.yml b/changelogs/unreleased/mrchrisw-22740-merge-api.yml new file mode 100644 index 00000000000..e75160aec70 --- /dev/null +++ b/changelogs/unreleased/mrchrisw-22740-merge-api.yml @@ -0,0 +1,4 @@ +--- +title: Fix updating merge_when_build_succeeds via merge API endpoint +merge_request: 10873 +author: |