diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-04-12 15:55:54 +0200 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-04-13 17:24:21 +0200 |
| commit | 31e28ebcebc054eaeef2eddba64ff2ff7ca3104f (patch) | |
| tree | 4402445fc4977c59582470d2f2d2bdf14b553388 /app/views/projects | |
| parent | ab4ea3720c084063ab83cef3aaf3a0b6adbc2a3c (diff) | |
| download | gitlab-ce-31e28ebcebc054eaeef2eddba64ff2ff7ca3104f.tar.gz | |
Load related MRs/branches asynchronously
Currently this works by loading the HAML partials via XHR. While this is
not the nicest setup it _is_ the easiest setup using the tools we
currently have.
Loading this data asynchronously doesn't make loading the related
MRs/branches itself faster, it merely ensures that loading the issue
itself is not slowed down.
Fixes gitlab-org/gitlab-ce#14949
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 6fa059cbe68..5fe5ddc0819 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -64,9 +64,11 @@ = @issue.description = edited_time_ago_with_tooltip(@issue, placement: 'bottom', html_class: 'issue_edited_ago') - .merge-requests - = render 'merge_requests' - = render 'related_branches' + #merge-requests{'data-url' => referenced_merge_requests_namespace_project_issue_url(@project.namespace, @project, @issue)} + // This element is filled in using JavaScript. + + #related-branches{'data-url' => related_branches_namespace_project_issue_url(@project.namespace, @project, @issue)} + // This element is filled in using JavaScript. .content-block.content-block-small = render 'new_branch' |