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 73a79f7e) 88f268b5 Replace absolute URLs on related branches/MRs with relative url to avoid hostname

Merge branch '40555-replace-absolute-urls-with-related-branches-to-avoid-hostname' into 'master'
957bf2a7 · Jacob Schatz · Winnie Hellmann · e9267131 · 957bf2a7 · 957bf2a7
Commit 957bf2a7 authored Dec 07, 2017 by Jacob Schatz Committed by Winnie Hellmann Dec 14, 2017
Showing with 8 additions and 2 deletions

show.html.haml app/views/projects/issues/show.html.haml +2 -2

40555-replace-absolute-urls-with-related-branches-to-avoid-hostname.yml ...absolute-urls-with-related-branches-to-avoid-hostname.yml +6 -0

No files found.
--- 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

--- 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
+---
+title: Fix related branches/Merge requests failing to load when the hostname setting
+  is changed
+merge_request:
+author:
+type: fixed