diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-12-04 17:19:20 -0600 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-12-04 17:30:26 -0600 |
| commit | 88f268b5e5d4327529f74484f82ae860eb13978b (patch) | |
| tree | b5a274671eb9c876cb6ca36ea67ab37298d9fe65 | |
| parent | e0f84130567dc34edf1ae75fcf595e24991d2fa9 (diff) | |
| download | gitlab-ce-88f268b5e5d4327529f74484f82ae860eb13978b.tar.gz | |
Replace absolute URLs on related branches/MRs with relative url to avoid hostname40555-replace-absolute-urls-with-related-branches-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 48410ffee21..3e03ae1e117 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 |