summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorBrian Kintz <elmugrat@gmail.com>2016-09-01 01:50:27 -0400
committerRémy Coutable <remy@rymai.me>2016-11-02 13:35:14 +0100
commit6419fe366a83314258f24d4ee2852a461b590c61 (patch)
treed087d02bc93809e0bdaeb34c8ab4ee5815ff9174 /app
parentd7859912b2a4a5d0f8aee63b393080ec03f5bbc2 (diff)
downloadgitlab-ce-6419fe366a83314258f24d4ee2852a461b590c61.tar.gz
Use the server's base URL without relative URL part when creating links in JIRA
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app')
-rw-r--r--app/models/project_services/jira_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb
index 5bcf199d468..0a493b7a12b 100644
--- a/app/models/project_services/jira_service.rb
+++ b/app/models/project_services/jira_service.rb
@@ -237,7 +237,7 @@ class JiraService < IssueTrackerService
end
def resource_url(resource)
- "#{Settings.gitlab['url'].chomp("/")}#{resource}"
+ "#{Settings.gitlab.base_url.chomp("/")}#{resource}"
end
def build_entity_url(entity_name, entity_id)