diff --git a/lib/workers/branch/parent.js b/lib/workers/branch/parent.js index d322a9d975bf7489bcacd7eace1a9abd5b68aec9..5f3c0e544fae57ea658897071d121f2233800123 100644 --- a/lib/workers/branch/parent.js +++ b/lib/workers/branch/parent.js @@ -63,11 +63,6 @@ async function getParentBranch(config) { logger.debug('PR is conflicted'); if (pr.canRebase) { logger.info(`Branch is not mergeable and needs rebasing`); - // TODO: Move this down to api library - if (config.isGitLab || config.isAzure) { - logger.info(`Deleting unmergeable branch in order to recreate/rebase`); - await platform.deleteBranch(branchName); - } // Setting parentBranch back to undefined means that we'll use the default branch return { parentBranch: undefined }; } diff --git a/lib/workers/global/index.js b/lib/workers/global/index.js index f95bb6fcb11c823003702d9ec43fb6d736f80da2..0f2517f9569e390c91df004df85b0ded86be3119 100644 --- a/lib/workers/global/index.js +++ b/lib/workers/global/index.js @@ -104,11 +104,6 @@ async function getRepositoryConfig(globalConfig, repository) { globalConfig, is.string(repository) ? { repository } : repository ); - repoConfig.isBitbucket = repoConfig.platform === 'bitbucket'; - repoConfig.isBitbucketServer = repoConfig.platform === 'bitbucket-server'; - repoConfig.isGitHub = repoConfig.platform === 'github'; - repoConfig.isGitLab = repoConfig.platform === 'gitlab'; - repoConfig.isAzure = repoConfig.platform === 'azure'; repoConfig.localDir = path.join( repoConfig.baseDir, `./repos/${repoConfig.platform}/${repoConfig.repository}` diff --git a/test/workers/branch/parent.spec.js b/test/workers/branch/parent.spec.js index 1181cf9b15d97f75bbf32b189af40813ca4776a9..876a3bdc2ec92b2c7208c9f8734694393f140ac6 100644 --- a/test/workers/branch/parent.spec.js +++ b/test/workers/branch/parent.spec.js @@ -75,17 +75,6 @@ describe('workers/branch/parent', () => { const res = await getParentBranch(config); expect(res.parentBranch).toBeUndefined(); }); - it('returns undefined if unmergeable and can rebase (gitlab)', async () => { - config.isGitLab = true; - platform.branchExists.mockReturnValue(true); - platform.getBranchPr.mockReturnValue({ - isConflicted: true, - canRebase: true, - }); - const res = await getParentBranch(config); - expect(res.parentBranch).toBeUndefined(); - expect(platform.deleteBranch).toHaveBeenCalledTimes(1); - }); it('returns branchName if automerge branch and not stale', async () => { config.automerge = true; config.automergeType = 'branch';