Commit 0174263c authored by Douwe Maan's avatar Douwe Maan

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
parents 0d866d89 20e47ead
...@@ -46,8 +46,8 @@ ...@@ -46,8 +46,8 @@
Edited Edited
= time_ago_with_tooltip(@issue.updated_at, placement: 'bottom', html_class: 'issue_edited_ago') = time_ago_with_tooltip(@issue.updated_at, placement: 'bottom', html_class: 'issue_edited_ago')
.merge-requests .merge-requests
= render 'merge_requests' = render 'merge_requests'
.content-block .content-block
= render 'votes/votes_block', votable: @issue = render 'votes/votes_block', votable: @issue
...@@ -57,4 +57,4 @@ ...@@ -57,4 +57,4 @@
.issuable-discussion .issuable-discussion
= render 'projects/issues/discussion' = render 'projects/issues/discussion'
= render 'shared/issuable/sidebar', issuable: @issue = render 'shared/issuable/sidebar', issuable: @issue
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment