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
This commit is contained in:
Douwe Maan 2016-02-12 17:30:43 +00:00
commit 0174263c9b
1 changed files with 3 additions and 3 deletions

View File

@ -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
= render 'shared/issuable/sidebar', issuable: @issue