diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-02-12 17:30:43 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-02-12 17:30:43 +0000 |
| commit | 0174263c9b60340e53635418da98681738cdddc3 (patch) | |
| tree | 5e58fdf8d32b89b38b1ee2607e62b0c58c5c5fa0 | |
| parent | 0d866d89ec26bf05f2777ac5e5cb3f23f90f0a8c (diff) | |
| parent | 20e47eadaeae36f8bb34c8d8480e21ddcd3d5478 (diff) | |
| download | gitlab-ce-0174263c9b60340e53635418da98681738cdddc3.tar.gz | |
Merge branch 'rs-issue-merge-requests' into 'master'
Correct indentation for `issues/merge_requests` partial render
Prior, it would only be shown if the issue had been edited.
See merge request !2789
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 121c775560f..fe977fd700c 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -46,8 +46,8 @@ Edited = time_ago_with_tooltip(@issue.updated_at, placement: 'bottom', html_class: 'issue_edited_ago') - .merge-requests - = render 'merge_requests' + .merge-requests + = render 'merge_requests' .content-block = render 'votes/votes_block', votable: @issue @@ -57,4 +57,4 @@ .issuable-discussion = render 'projects/issues/discussion' -= render 'shared/issuable/sidebar', issuable: @issue
\ No newline at end of file += render 'shared/issuable/sidebar', issuable: @issue |