diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2015-03-21 18:03:35 +0300 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2015-03-21 18:03:35 +0300 |
| commit | f5e65e2e508269ff7c18318526ba01f8e7d83951 (patch) | |
| tree | dd834b066dc51de87139d69ea042e0bdfd69334d /app/views/projects/merge_requests/_discussion.html.haml | |
| parent | cc29ce491786d631586c3b0d0da310b8b790a673 (diff) | |
| parent | 6cf189f0a92772b9174f913e7c74a4889d54e9a6 (diff) | |
Merge branch 'master' into markdown-tags
Merge updated CHANGELOG entries
Diffstat (limited to 'app/views/projects/merge_requests/_discussion.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/_discussion.html.haml | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/app/views/projects/merge_requests/_discussion.html.haml b/app/views/projects/merge_requests/_discussion.html.haml index 79a093dc775..eb72eaabd8b 100644 --- a/app/views/projects/merge_requests/_discussion.html.haml +++ b/app/views/projects/merge_requests/_discussion.html.haml @@ -7,6 +7,8 @@ .row %section.col-md-9 + .votes-holder.pull-right + #votes= render 'votes/votes_block', votable: @merge_request = render "projects/merge_requests/show/participants" = render "projects/notes/notes_with_form" %aside.col-md-3 @@ -17,14 +19,10 @@ %hr .context = render partial: 'projects/merge_requests/show/context', locals: { merge_request: @merge_request } - %hr - .votes-holder - %h6 Votes - #votes= render 'votes/votes_block', votable: @merge_request - if @merge_request.labels.any? - %hr - %h6 Labels + .issuable-context-title + %label Labels .merge-request-show-labels - @merge_request.labels.each do |label| = link_to namespace_project_merge_requests_path(@project.namespace, @project, label_name: label.name) do |