diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-05-07 00:28:35 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-05-07 06:16:39 -0700 |
| commit | 58c09eb70941a0954fb5cd7b0c6316c698353edb (patch) | |
| tree | aec474d2b38d02064e50b2eed8acd19b242954a9 /app | |
| parent | fb688545e51d87d3b145b0c7fa9adc8c6b2139b2 (diff) | |
| download | gitlab-ce-58c09eb70941a0954fb5cd7b0c6316c698353edb.tar.gz | |
Use a path for the related merge requests endpointsh-fix-related-merge-requests-path
Hosts using a non-standard configuration may have a different
hostname/port/scheme than what may be configured on the GitLab
server. While expose_url should generate a proper URL, there are cases
where it may not work. Since we don't need the full URL, we can use the
relative path.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61280
Diffstat (limited to 'app')
| -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 715c36fa9aa..d55afee4523 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -79,7 +79,7 @@ = render_if_exists 'projects/issues/related_issues' - #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 } } + #js-related-merge-requests{ data: { endpoint: expose_path(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) } } |