diff --git a/lib/platform/gitlab/index.js b/lib/platform/gitlab/index.js index 80e106fbcd214758b911b3eae93d9237f74b9a9c..63c2d4308f622f322089bc52534a5259d4b585ad 100644 --- a/lib/platform/gitlab/index.js +++ b/lib/platform/gitlab/index.js @@ -639,9 +639,7 @@ async function createPr( title, description, labels, - useDefaultBranch, - _, - automerge + useDefaultBranch ) { const targetBranch = useDefaultBranch ? config.defaultBranch @@ -665,21 +663,6 @@ async function createPr( if (config.prList) { config.prList.push(pr); } - if (automerge === true) { - try { - await get.put( - `projects/${config.repository}/merge_requests/${pr.iid}/merge`, - { - body: { - should_remove_source_branch: true, - merge_when_pipeline_succeeds: true, - }, - } - ); - } catch (err) /* istanbul ignore next */ { - logger.debug({ err }, 'Automerge on PR creation failed'); - } - } return pr; } diff --git a/lib/workers/pr/index.js b/lib/workers/pr/index.js index 04c9496d398f125fcd19e796481427a813818bb2..ed1043131749282282e178efda82404611dbe0da 100644 --- a/lib/workers/pr/index.js +++ b/lib/workers/pr/index.js @@ -247,15 +247,13 @@ async function ensurePr(prConfig) { logger.info('DRY-RUN: Would create PR: ' + prTitle); pr = { number: 0, displayNumber: 'Dry run PR' }; } else { - const automergePr = config.automerge && config.automergeType === 'pr'; pr = await platform.createPr( branchName, prTitle, prBody, config.labels, false, - config.statusCheckVerify, - automergePr + config.statusCheckVerify ); logger.info({ branch: branchName, pr: pr.number }, 'PR created'); } diff --git a/test/platform/gitlab/__snapshots__/index.spec.js.snap b/test/platform/gitlab/__snapshots__/index.spec.js.snap index 4204d5a22c95286135702cde53271b47b580c385..971da13226b4e59a21519b2b925e2a0eb09015d7 100644 --- a/test/platform/gitlab/__snapshots__/index.spec.js.snap +++ b/test/platform/gitlab/__snapshots__/index.spec.js.snap @@ -68,20 +68,6 @@ Array [ ] `; -exports[`platform/gitlab createPr(branchName, title, body) auto-accepts the MR when requested 1`] = ` -Array [ - Array [ - "projects/undefined/merge_requests/12345/merge", - Object { - "body": Object { - "merge_when_pipeline_succeeds": true, - "should_remove_source_branch": true, - }, - }, - ], -] -`; - exports[`platform/gitlab createPr(branchName, title, body) returns the PR 1`] = ` Object { "branchName": "some-branch", diff --git a/test/platform/gitlab/index.spec.js b/test/platform/gitlab/index.spec.js index 9bd9065e58a0d86eb224a4547bef6c917552b0e2..b800f76898f49ec1819688138fd77f9389bf2a99 100644 --- a/test/platform/gitlab/index.spec.js +++ b/test/platform/gitlab/index.spec.js @@ -806,26 +806,6 @@ describe('platform/gitlab', () => { expect(pr).toMatchSnapshot(); expect(get.post.mock.calls).toMatchSnapshot(); }); - it('auto-accepts the MR when requested', async () => { - get.post.mockReturnValueOnce({ - body: { - id: 1, - iid: 12345, - }, - }); - const _ = 42; - const automerge = true; - await gitlab.createPr( - 'some-branch', - 'some-title', - 'the-body', - [], - true, - _, - automerge - ); - expect(get.put.mock.calls).toMatchSnapshot(); - }); }); describe('getPr(prNo)', () => { it('returns the PR', async () => { diff --git a/test/workers/pr/__snapshots__/index.spec.js.snap b/test/workers/pr/__snapshots__/index.spec.js.snap index 3172fb31db1a3c026ea6d0e3e4ebec02e7c5e31f..f99be39f2ebfd4ca2957412001bf4ff0831845c6 100644 --- a/test/workers/pr/__snapshots__/index.spec.js.snap +++ b/test/workers/pr/__snapshots__/index.spec.js.snap @@ -67,7 +67,6 @@ Array [ Array [], false, false, - false, ] `; @@ -112,7 +111,6 @@ Array [ Array [], false, false, - true, ] `; @@ -174,7 +172,6 @@ note 2 Array [], false, false, - false, ] `; @@ -219,7 +216,6 @@ Array [ Array [], false, false, - false, ] `;