Skip to content
Snippets Groups Projects
Commit 0174263c authored by Douwe Maan's avatar Douwe Maan
Browse files

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
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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
Loading
Loading
@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment