diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2015-02-22 07:55:30 -0700 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2015-02-22 07:55:30 -0700 |
| commit | 5a8d8b6f20ab795fddcf651a7298f61696c7e2ab (patch) | |
| tree | efad20db1967808cb278f903cda3f6d87d933d87 /app/views/projects/merge_requests/_discussion.html.haml | |
| parent | 64a7ecc9267f6f82d34b9e87a0271216c94cbbfd (diff) | |
| parent | 44dbbb76fc134826b80fa10aac60bf8c79ba01e7 (diff) | |
| download | gitlab-ce-5a8d8b6f20ab795fddcf651a7298f61696c7e2ab.tar.gz | |
Merge branch 'master' into rails-4.1.9
Conflicts:
app/views/dashboard/projects.html.haml
Diffstat (limited to 'app/views/projects/merge_requests/_discussion.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/_discussion.html.haml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/_discussion.html.haml b/app/views/projects/merge_requests/_discussion.html.haml index 83947cf6ac2..2df35aac025 100644 --- a/app/views/projects/merge_requests/_discussion.html.haml +++ b/app/views/projects/merge_requests/_discussion.html.haml @@ -6,10 +6,10 @@ = link_to 'Reopen', namespace_project_merge_request_path(@project.namespace, @project, @merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-grouped btn-reopen reopen-mr-link js-note-target-reopen", title: "Reopen merge request" .row - .col-md-9 + %section.col-md-9 = render "projects/merge_requests/show/participants" = render "projects/notes/notes_with_form" - .col-md-3 + %aside.col-md-3 .issuable-affix .clearfix %span.slead.has_tooltip{:"data-original-title" => 'Cross-project reference'} @@ -29,3 +29,5 @@ - @merge_request.labels.each do |label| = link_to namespace_project_merge_requests_path(@project.namespace, @project, label_name: label.name) do = render_colored_label(label) + = link_to '#aside', class: 'show-aside' do + %i.fa.fa-angle-left |