home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 05:36:07 +10:00
Code Issues Packages Projects Releases Wiki Activity

Votes block has less priority than assignee/milestone

Browse Source
This commit is contained in:
Dmitriy Zaporozhets
2015-01-18 19:42:09 -08:00
parent 3a46ea4ce6
commit fd41e39906
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/projects/issues/_discussion.html.haml
+4 -4
View File
@@ -19,14 +19,14 @@
%span.slead.has_tooltip{:"data-original-title" => 'Cross-project reference'}
= cross_project_reference(@project, @issue)
%hr
.context
%cite.cgray
= render partial: 'issue_context', locals: { issue: @issue }
%hr
.clearfix
.votes-holder
%h6 Votes
#votes= render 'votes/votes_block', votable: @issue
%hr
.context
%cite.cgray
= render partial: 'issue_context', locals: { issue: @issue }
- if @issue.labels.any?
%hr
app/views/projects/merge_requests/_discussion.html.haml
+4 -4
View File
@@ -14,13 +14,13 @@
%span.slead.has_tooltip{:"data-original-title" => 'Cross-project reference'}
= cross_project_reference(@project, @merge_request)
%hr
.votes-holder.hidden-sm.hidden-xs
%h6 Votes
#votes= render 'votes/votes_block', votable: @merge_request
%hr
.context
%cite.cgray
= render partial: 'projects/merge_requests/show/context', locals: { merge_request: @merge_request }
%hr
.votes-holder.hidden-sm.hidden-xs
%h6 Votes
#votes= render 'votes/votes_block', votable: @merge_request
- if @merge_request.labels.any?
%hr