summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2019-04-18 09:38:46 +0000
committerFatih Acet <acetfatih@gmail.com>2019-04-18 09:38:46 +0000
commit2bbad757c9d16abe045fa1f3529c81e5c6c9d3e7 (patch)
tree4ceff5215f7613246721f9ef38eeff7039d0553a
parentbe19a0b9b49775192df63be996698b8e46e3e38a (diff)
parent31b4e54e86fd672d60596097b68bcba61a6f7686 (diff)
downloadgitlab-ce-2bbad757c9d16abe045fa1f3529c81e5c6c9d3e7.tar.gz
Merge branch 'sh-fix-related-merge-request-api-paths' into 'master'
Fix related merge requests not working with relative URL root See merge request gitlab-org/gitlab-ce!27475
-rw-r--r--app/views/projects/issues/show.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index 2c95ac6dbb3..4bf1d8702af 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -77,7 +77,7 @@
= edited_time_ago_with_tooltip(@issue, placement: 'bottom', html_class: 'issue-edited-ago js-issue-edited-ago')
- #js-related-merge-requests{ data: { endpoint: api_v4_projects_issues_related_merge_requests_path(id: @project.id, issue_iid: @issue.iid), project_namespace: @project.namespace.path, project_path: @project.path } }
+ #js-related-merge-requests{ data: { endpoint: expose_url(api_v4_projects_issues_related_merge_requests_path(id: @project.id, issue_iid: @issue.iid)), project_namespace: @project.namespace.path, project_path: @project.path } }
- if can?(current_user, :download_code, @project)
#related-branches{ data: { url: related_branches_project_issue_path(@project, @issue) } }