diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2019-04-18 09:38:46 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-04-23 08:43:00 +0000 |
| commit | 3d194de8c1ca20a8959761d80a651e634dd2c155 (patch) | |
| tree | 83836294a4698fc0604541d203600934aca178c0 | |
| parent | 57777a3260cffd5bbfe37c5336f183836df6214f (diff) | |
| download | gitlab-ce-3d194de8c1ca20a8959761d80a651e634dd2c155.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
(cherry picked from commit 2bbad757c9d16abe045fa1f3529c81e5c6c9d3e7)
31b4e54e Fix related merge requests not working with relative URL root
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 2 |
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) } } |