Merge branch 'jira_service_simplify' into 'master'

JiraService: simplify url generation

Fixes #24085

See merge request !7307

3 files changed, 16 insertions, 11 deletions

diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb
index 2dbe0075465..7ce274b5dca 100644
--- a/app/models/project_services/jira_service.rb
+++ b/app/models/project_services/jira_service.rb
@@ -256,16 +256,14 @@ class JiraService < IssueTrackerService
   end
 
   def build_entity_url(entity_name, entity_id)
-    resource_url(
-      polymorphic_url(
-        [
-          self.project.namespace.becomes(Namespace),
-          self.project,
-          entity_name
-        ],
-        id: entity_id,
-        routing_type: :path
-      )
+    polymorphic_url(
+      [
+        self.project.namespace.becomes(Namespace),
+        self.project,
+        entity_name
+      ],
+      id:   entity_id,
+      host: Settings.gitlab.base_url
     )
   end
 end
diff --git a/changelogs/unreleased/jira_service_simplify.yml b/changelogs/unreleased/jira_service_simplify.yml
new file mode 100644
index 00000000000..51cedd8ce5e
--- /dev/null
+++ b/changelogs/unreleased/jira_service_simplify.yml
@@ -0,0 +1,4 @@
+---
+title: simplify url generation
+merge_request:
+author: Jarka Kadlecova
diff --git a/spec/models/project_services/jira_service_spec.rb b/spec/models/project_services/jira_service_spec.rb
index 05ee4a08391..2a87a411e9d 100644
--- a/spec/models/project_services/jira_service_spec.rb
+++ b/spec/models/project_services/jira_service_spec.rb
@@ -69,6 +69,7 @@ describe JiraService, models: true do
   end
 
   describe "Execute" do
+    let(:custom_base_url) { 'http://custom_url' }
     let(:user)    { create(:user) }
     let(:project) { create(:project) }
     let(:merge_request) { create(:merge_request) }
@@ -107,10 +108,12 @@ describe JiraService, models: true do
     end
 
     it "references the GitLab commit/merge request" do
+      stub_config_setting(base_url: custom_base_url)
+
       @jira_service.execute(merge_request, ExternalIssue.new("JIRA-123", project))
 
       expect(WebMock).to have_requested(:post, @comment_url).with(
-        body: /#{Gitlab.config.gitlab.url}\/#{project.path_with_namespace}\/commit\/#{merge_request.diff_head_sha}/
+        body: /#{custom_base_url}\/#{project.path_with_namespace}\/commit\/#{merge_request.diff_head_sha}/
       ).once
     end