From 2d4ca2b54fe2b365381a188a6d1bc4cc3eb61f1b Mon Sep 17 00:00:00 2001 From: Mazhar Zandsalimi Date: Sun, 21 May 2023 13:21:34 +0330 Subject: [PATCH 1/2] Update gitlab merge request URL to match new routing --- pkg/commands/hosting_service/definitions.go | 4 ++-- .../hosting_service/hosting_service_test.go | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkg/commands/hosting_service/definitions.go b/pkg/commands/hosting_service/definitions.go index bfe374640..b98c89708 100644 --- a/pkg/commands/hosting_service/definitions.go +++ b/pkg/commands/hosting_service/definitions.go @@ -33,8 +33,8 @@ var bitbucketServiceDef = ServiceDefinition{ var gitLabServiceDef = ServiceDefinition{ provider: "gitlab", - pullRequestURLIntoDefaultBranch: "/merge_requests/new?merge_request[source_branch]={{.From}}", - pullRequestURLIntoTargetBranch: "/merge_requests/new?merge_request[source_branch]={{.From}}&merge_request[target_branch]={{.To}}", + pullRequestURLIntoDefaultBranch: "/-/merge_requests/new?merge_request[source_branch]={{.From}}", + pullRequestURLIntoTargetBranch: "/-/merge_requests/new?merge_request[source_branch]={{.From}}&merge_request[target_branch]={{.To}}", commitURL: "/commit/{{.CommitSha}}", regexStrings: defaultUrlRegexStrings, repoURLTemplate: defaultRepoURLTemplate, diff --git a/pkg/commands/hosting_service/hosting_service_test.go b/pkg/commands/hosting_service/hosting_service_test.go index 4a58a3975..83d707a43 100644 --- a/pkg/commands/hosting_service/hosting_service_test.go +++ b/pkg/commands/hosting_service/hosting_service_test.go @@ -112,7 +112,7 @@ func TestGetPullRequestURL(t *testing.T) { remoteUrl: "git@gitlab.com:peter/calculator.git", test: func(url string, err error) { assert.NoError(t, err) - assert.Equal(t, "https://gitlab.com/peter/calculator/merge_requests/new?merge_request[source_branch]=feature%2Fui", url) + assert.Equal(t, "https://gitlab.com/peter/calculator/-/merge_requests/new?merge_request[source_branch]=feature%2Fui", url) }, }, { @@ -121,7 +121,7 @@ func TestGetPullRequestURL(t *testing.T) { remoteUrl: "git@gitlab.com:peter/public/calculator.git", test: func(url string, err error) { assert.NoError(t, err) - assert.Equal(t, "https://gitlab.com/peter/public/calculator/merge_requests/new?merge_request[source_branch]=feature%2Fui", url) + assert.Equal(t, "https://gitlab.com/peter/public/calculator/-/merge_requests/new?merge_request[source_branch]=feature%2Fui", url) }, }, { @@ -130,7 +130,7 @@ func TestGetPullRequestURL(t *testing.T) { remoteUrl: "https://gitlab.com/peter/public/calculator.git", test: func(url string, err error) { assert.NoError(t, err) - assert.Equal(t, "https://gitlab.com/peter/public/calculator/merge_requests/new?merge_request[source_branch]=feature%2Fui", url) + assert.Equal(t, "https://gitlab.com/peter/public/calculator/-/merge_requests/new?merge_request[source_branch]=feature%2Fui", url) }, }, { @@ -140,7 +140,7 @@ func TestGetPullRequestURL(t *testing.T) { remoteUrl: "git@gitlab.com:peter/calculator.git", test: func(url string, err error) { assert.NoError(t, err) - assert.Equal(t, "https://gitlab.com/peter/calculator/merge_requests/new?merge_request[source_branch]=feature%2Fcommit-ui&merge_request[target_branch]=epic%2Fui", url) + assert.Equal(t, "https://gitlab.com/peter/calculator/-/merge_requests/new?merge_request[source_branch]=feature%2Fcommit-ui&merge_request[target_branch]=epic%2Fui", url) }, }, { @@ -150,7 +150,7 @@ func TestGetPullRequestURL(t *testing.T) { remoteUrl: "git@gitlab.com:peter/public/calculator.git", test: func(url string, err error) { assert.NoError(t, err) - assert.Equal(t, "https://gitlab.com/peter/public/calculator/merge_requests/new?merge_request[source_branch]=feature%2Fcommit-ui&merge_request[target_branch]=epic%2Fui", url) + assert.Equal(t, "https://gitlab.com/peter/public/calculator/-/merge_requests/new?merge_request[source_branch]=feature%2Fcommit-ui&merge_request[target_branch]=epic%2Fui", url) }, }, { @@ -160,7 +160,7 @@ func TestGetPullRequestURL(t *testing.T) { remoteUrl: "https://gitlab.com/peter/public/calculator.git", test: func(url string, err error) { assert.NoError(t, err) - assert.Equal(t, "https://gitlab.com/peter/public/calculator/merge_requests/new?merge_request[source_branch]=feature%2Fcommit-ui&merge_request[target_branch]=epic%2Fui", url) + assert.Equal(t, "https://gitlab.com/peter/public/calculator/-/merge_requests/new?merge_request[source_branch]=feature%2Fcommit-ui&merge_request[target_branch]=epic%2Fui", url) }, }, { @@ -373,7 +373,7 @@ func TestGetPullRequestURL(t *testing.T) { remoteUrl: "git@gitlab.com:me/public/repo-with-issues.git", test: func(url string, err error) { assert.NoError(t, err) - assert.Equal(t, "https://gitlab.com/me/public/repo-with-issues/merge_requests/new?merge_request[source_branch]=feature%2FsomeIssue%23123&merge_request[target_branch]=master", url) + assert.Equal(t, "https://gitlab.com/me/public/repo-with-issues/-/merge_requests/new?merge_request[source_branch]=feature%2FsomeIssue%23123&merge_request[target_branch]=master", url) }, }, { @@ -383,7 +383,7 @@ func TestGetPullRequestURL(t *testing.T) { remoteUrl: "git@gitlab.com:me/public/repo-with-issues.git", test: func(url string, err error) { assert.NoError(t, err) - assert.Equal(t, "https://gitlab.com/me/public/repo-with-issues/merge_requests/new?merge_request[source_branch]=yolo&merge_request[target_branch]=archive%2Fnever-ending-feature%23666", url) + assert.Equal(t, "https://gitlab.com/me/public/repo-with-issues/-/merge_requests/new?merge_request[source_branch]=yolo&merge_request[target_branch]=archive%2Fnever-ending-feature%23666", url) }, }, } From 59379b45da57b8359d5f271a3447ec54273da3e2 Mon Sep 17 00:00:00 2001 From: Mazhar Zandsalimi Date: Mon, 22 May 2023 07:39:47 +0330 Subject: [PATCH 2/2] Update gitlab commit URL to match new routing --- pkg/commands/hosting_service/definitions.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/commands/hosting_service/definitions.go b/pkg/commands/hosting_service/definitions.go index b98c89708..63a1b818f 100644 --- a/pkg/commands/hosting_service/definitions.go +++ b/pkg/commands/hosting_service/definitions.go @@ -35,7 +35,7 @@ var gitLabServiceDef = ServiceDefinition{ provider: "gitlab", pullRequestURLIntoDefaultBranch: "/-/merge_requests/new?merge_request[source_branch]={{.From}}", pullRequestURLIntoTargetBranch: "/-/merge_requests/new?merge_request[source_branch]={{.From}}&merge_request[target_branch]={{.To}}", - commitURL: "/commit/{{.CommitSha}}", + commitURL: "/-/commit/{{.CommitSha}}", regexStrings: defaultUrlRegexStrings, repoURLTemplate: defaultRepoURLTemplate, }