diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-18 19:42:09 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-18 19:42:09 -0800 |
| commit | fd41e39906544e3e587ccd38491f4fa6cd445a99 (patch) | |
| tree | 14e6509ff0fc7e433e744808621deda8e98410a4 | |
| parent | 3a46ea4ce666fb0276d71a55f8ee3c5fad76b66d (diff) | |
| download | gitlab-ce-fd41e39906544e3e587ccd38491f4fa6cd445a99.tar.gz | |
Votes block has less priority than assignee/milestone
| -rw-r--r-- | app/views/projects/issues/_discussion.html.haml | 8 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_discussion.html.haml | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/app/views/projects/issues/_discussion.html.haml b/app/views/projects/issues/_discussion.html.haml index ec03f375d6b..b5d6a16a1e1 100644 --- a/app/views/projects/issues/_discussion.html.haml +++ b/app/views/projects/issues/_discussion.html.haml @@ -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 diff --git a/app/views/projects/merge_requests/_discussion.html.haml b/app/views/projects/merge_requests/_discussion.html.haml index 6bb5c465596..64bae800785 100644 --- a/app/views/projects/merge_requests/_discussion.html.haml +++ b/app/views/projects/merge_requests/_discussion.html.haml @@ -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 |