Commit a5314e79 authored by Stan Hu's avatar Stan Hu

Fix URL construction for merge requests, issues, notes, and commits for relative URL config

Closes https://github.com/gitlabhq/gitlabhq/issues/9605
parent e8bbc837
Please view this file on the master branch, on stable branches it's out of date. Please view this file on the master branch, on stable branches it's out of date.
v 8.0.0 (unreleased) v 8.0.0 (unreleased)
- Fix URL construction for merge requests, issues, notes, and commits for relative URL config (Stan Hu)
- Omit filename in Content-Disposition header in raw file download to avoid RFC 6266 encoding issues (Stan HU) - Omit filename in Content-Disposition header in raw file download to avoid RFC 6266 encoding issues (Stan HU)
- Prevent anchors from being hidden by header (Stan Hu) - Prevent anchors from being hidden by header (Stan Hu)
- Fix bug where only the first 15 Bitbucket issues would be imported (Stan Hu) - Fix bug where only the first 15 Bitbucket issues would be imported (Stan Hu)
......
...@@ -23,12 +23,12 @@ module Gitlab ...@@ -23,12 +23,12 @@ module Gitlab
def build_issue_url(id) def build_issue_url(id)
issue = Issue.find(id) issue = Issue.find(id)
issue_url(issue, host: Gitlab.config.gitlab['url']) issue_url(issue)
end end
def build_merge_request_url(id) def build_merge_request_url(id)
merge_request = MergeRequest.find(id) merge_request = MergeRequest.find(id)
merge_request_url(merge_request, host: Gitlab.config.gitlab['url']) merge_request_url(merge_request)
end end
def build_note_url(id) def build_note_url(id)
...@@ -37,22 +37,18 @@ module Gitlab ...@@ -37,22 +37,18 @@ module Gitlab
namespace_project_commit_url(namespace_id: note.project.namespace, namespace_project_commit_url(namespace_id: note.project.namespace,
id: note.commit_id, id: note.commit_id,
project_id: note.project, project_id: note.project,
host: Gitlab.config.gitlab['url'],
anchor: "note_#{note.id}") anchor: "note_#{note.id}")
elsif note.for_issue? elsif note.for_issue?
issue = Issue.find(note.noteable_id) issue = Issue.find(note.noteable_id)
issue_url(issue, issue_url(issue,
host: Gitlab.config.gitlab['url'],
anchor: "note_#{note.id}") anchor: "note_#{note.id}")
elsif note.for_merge_request? elsif note.for_merge_request?
merge_request = MergeRequest.find(note.noteable_id) merge_request = MergeRequest.find(note.noteable_id)
merge_request_url(merge_request, merge_request_url(merge_request,
host: Gitlab.config.gitlab['url'],
anchor: "note_#{note.id}") anchor: "note_#{note.id}")
elsif note.for_project_snippet? elsif note.for_project_snippet?
snippet = Snippet.find(note.noteable_id) snippet = Snippet.find(note.noteable_id)
project_snippet_url(snippet, project_snippet_url(snippet,
host: Gitlab.config.gitlab['url'],
anchor: "note_#{note.id}") anchor: "note_#{note.id}")
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment