summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-02-11 11:17:45 -0500
committerRobert Speicher <rspeicher@gmail.com>2016-02-11 11:17:45 -0500
commit20e47eadaeae36f8bb34c8d8480e21ddcd3d5478 (patch)
tree4bf616fbec1ed20a794a3d1d97cbf961b61a9e31
parent51998fddcaafdb2c09dc456b877e1ceb709cd17d (diff)
downloadgitlab-ce-20e47eadaeae36f8bb34c8d8480e21ddcd3d5478.tar.gz
Correct indentation for `issues/merge_requests` partial renderrs-issue-merge-requests
Prior, it would only be shown if the issue had been edited.
-rw-r--r--app/views/projects/issues/show.html.haml6
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