Skip to content

Commit 1806c97

Browse files
author
Ender Tunc
committed
Revert "add should_remove_source_branch query param to '/merge' request"
This reverts commit 6d6dc64.
1 parent f218dbb commit 1806c97

File tree

3 files changed

+7
-18
lines changed

3 files changed

+7
-18
lines changed

modules/core/src/main/scala/org/scalasteward/core/forge/gitlab/GitLabApiAlg.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ final class GitLabApiAlg[F[_]: Parallel](
238238
res <-
239239
client
240240
.put[MergeRequestOut](
241-
url.mergeWhenPiplineSucceeds(repo, mr.iid, gitLabCfg.removeSourceBranch),
241+
url.mergeWhenPiplineSucceeds(repo, mr.iid),
242242
modify(repo)
243243
)
244244
// it's possible that our status changed from can be merged already,

modules/core/src/main/scala/org/scalasteward/core/forge/gitlab/Url.scala

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,9 @@ class Url(apiHost: Uri) {
3939
def existingMergeRequest(repo: Repo, number: PullRequestNumber): Uri =
4040
mergeRequest(repo) / number.toString
4141

42-
def mergeWhenPiplineSucceeds(
43-
repo: Repo,
44-
number: PullRequestNumber,
45-
removeSourceBranch: Boolean
46-
): Uri =
42+
def mergeWhenPiplineSucceeds(repo: Repo, number: PullRequestNumber): Uri =
4743
(existingMergeRequest(repo, number) / "merge")
4844
.withQueryParam("merge_when_pipeline_succeeds", "true")
49-
.withOptionQueryParam(
50-
"should_remove_source_branch",
51-
Option.when(removeSourceBranch)(removeSourceBranch)
52-
)
5345

5446
def requiredApprovals(repo: Repo, number: PullRequestNumber, approvalsRequired: Int): Uri =
5547
(existingMergeRequest(repo, number) / "approvals")

modules/core/src/test/scala/org/scalasteward/core/forge/gitlab/GitLabApiAlgTest.scala

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ class GitLabApiAlgTest extends CatsEffectSuite with Http4sDsl[MockEff] {
3131
object MergeWhenPipelineSucceedsMatcher
3232
extends QueryParamDecoderMatcher[Boolean]("merge_when_pipeline_succeeds")
3333

34-
object ShouldRemoveSourceBranchMatcher
35-
extends QueryParamDecoderMatcher[Boolean]("should_remove_source_branch")
36-
3734
object RequiredReviewersMatcher extends QueryParamDecoderMatcher[Int]("approvals_required")
3835

3936
object UsernameMatcher extends QueryParamDecoderMatcher[String]("username")
@@ -91,7 +88,7 @@ class GitLabApiAlgTest extends CatsEffectSuite with Http4sDsl[MockEff] {
9188
)
9289

9390
case PUT -> Root / "projects" / "foo/bar" / "merge_requests" / "150" / "merge"
94-
:? MergeWhenPipelineSucceedsMatcher(_) +& ShouldRemoveSourceBranchMatcher(_) =>
91+
:? MergeWhenPipelineSucceedsMatcher(_) =>
9592
Ok(
9693
getMr.deepMerge(
9794
json""" { "iid": 150, "web_url": "https://gitlab.com/foo/bar/merge_requests/150" } """
@@ -143,12 +140,12 @@ class GitLabApiAlgTest extends CatsEffectSuite with Http4sDsl[MockEff] {
143140
user
144141
)
145142

146-
private val gitlabApiAlgAutoMergeAndRemoveSourceBranch = ForgeSelection.forgeApiAlg[MockEff](
143+
private val gitlabApiAlgAutoMerge = ForgeSelection.forgeApiAlg[MockEff](
147144
config.forgeCfg.copy(tpe = ForgeType.GitLab, doNotFork = true),
148145
GitLabCfg(
149146
mergeWhenPipelineSucceeds = true,
150147
requiredReviewers = None,
151-
removeSourceBranch = true
148+
removeSourceBranch = false
152149
),
153150
user
154151
)
@@ -270,8 +267,8 @@ class GitLabApiAlgTest extends CatsEffectSuite with Http4sDsl[MockEff] {
270267
assertIO(prOut, expected)
271268
}
272269

273-
test("createPullRequest -- auto merge and remove source branch") {
274-
val prOut = gitlabApiAlgAutoMergeAndRemoveSourceBranch
270+
test("createPullRequest -- auto merge") {
271+
val prOut = gitlabApiAlgAutoMerge
275272
.createPullRequest(Repo("foo", "bar"), newPRData)
276273
.runA(state)
277274

0 commit comments

Comments
 (0)