diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-12-07 21:24:15 +0000 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2017-12-14 09:15:13 +0000 |
| commit | 957bf2a7dfe88f72f6a910e088ad47288107d61b (patch) | |
| tree | 901b1f625c5cb1139600e28c368e5c6ebaf931c4 | |
| parent | e926713148d6c91be2b422eeda656ffcdee027a8 (diff) | |
| download | gitlab-ce-957bf2a7dfe88f72f6a910e088ad47288107d61b.tar.gz | |
Merge branch '40555-replace-absolute-urls-with-related-branches-to-avoid-hostname' into 'master'
Replace absolute URLs on related branches/MRs with relative url to avoid hostname
Closes #40555
See merge request gitlab-org/gitlab-ce!15735
(cherry picked from commit 73a79f7efbd8dec42b4a344faa3df5bf1c57a315)
88f268b5 Replace absolute URLs on related branches/MRs with relative url to avoid hostname
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/40555-replace-absolute-urls-with-related-branches-to-avoid-hostname.yml | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 9978ac48dc3..10fc4d561ce 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -74,10 +74,10 @@ = edited_time_ago_with_tooltip(@issue, placement: 'bottom', html_class: 'issue-edited-ago js-issue-edited-ago') - #merge-requests{ data: { url: referenced_merge_requests_project_issue_url(@project, @issue) } } + #merge-requests{ data: { url: referenced_merge_requests_project_issue_path(@project, @issue) } } // This element is filled in using JavaScript. - #related-branches{ data: { url: related_branches_project_issue_url(@project, @issue) } } + #related-branches{ data: { url: related_branches_project_issue_path(@project, @issue) } } // This element is filled in using JavaScript. .content-block.emoji-block diff --git a/changelogs/unreleased/40555-replace-absolute-urls-with-related-branches-to-avoid-hostname.yml b/changelogs/unreleased/40555-replace-absolute-urls-with-related-branches-to-avoid-hostname.yml new file mode 100644 index 00000000000..4f0eaf8472f --- /dev/null +++ b/changelogs/unreleased/40555-replace-absolute-urls-with-related-branches-to-avoid-hostname.yml @@ -0,0 +1,6 @@ +--- +title: Fix related branches/Merge requests failing to load when the hostname setting + is changed +merge_request: +author: +type: fixed |