Render MR diff full size of screen

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

1 files changed, 29 insertions, 27 deletions

diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index a05c78bc3e9..57ab6bdd545 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -26,33 +26,6 @@
       = render "projects/merge_requests/show/commits"
       = render "projects/merge_requests/show/participants"
 
-      - if @commits.present?
-        %ul.nav.nav-pills.merge-request-tabs
-          %li.notes-tab{data: {action: 'notes'}}
-            = link_to project_merge_request_path(@project, @merge_request) do
-              %i.fa.fa-comment
-              Discussion
-              %span.badge= @merge_request.mr_and_commit_notes.count
-          %li.diffs-tab{data: {action: 'diffs'}}
-            = link_to diffs_project_merge_request_path(@project, @merge_request) do
-              %i.fa.fa-list-alt
-              Changes
-              %span.badge= @merge_request.diffs.size
-
-      - content_for :note_actions do
-        - if can?(current_user, :modify_merge_request, @merge_request)
-          - if @merge_request.open?
-            = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :close }), method: :put, class: "btn btn-grouped btn-close close-mr-link js-note-target-close", title: "Close merge request"
-          - if @merge_request.closed?
-            = link_to 'Reopen', project_merge_request_path(@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"
-
-      .diffs.tab-content
-        - if current_page?(action: 'diffs')
-          = render "projects/merge_requests/show/diffs"
-      .notes.tab-content.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }
-        = render "projects/notes/notes_with_form"
-      .mr-loading-status
-        = spinner
     .col-sm-3
       .issue-btn-group
         - if can?(current_user, :modify_merge_request, @merge_request)
@@ -84,6 +57,35 @@
         %cite.cgray
           = render partial: 'projects/merge_requests/show/context', locals: { merge_request: @merge_request }
 
+  - if @commits.present?
+    %ul.nav.nav-tabs.merge-request-tabs
+      %li.notes-tab{data: {action: 'notes'}}
+        = link_to project_merge_request_path(@project, @merge_request) do
+          %i.fa.fa-comment
+          Discussion
+          %span.badge= @merge_request.mr_and_commit_notes.count
+      %li.diffs-tab{data: {action: 'diffs'}}
+        = link_to diffs_project_merge_request_path(@project, @merge_request) do
+          %i.fa.fa-list-alt
+          Changes
+          %span.badge= @merge_request.diffs.size
+
+  - content_for :note_actions do
+    - if can?(current_user, :modify_merge_request, @merge_request)
+      - if @merge_request.open?
+        = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :close }), method: :put, class: "btn btn-grouped btn-close close-mr-link js-note-target-close", title: "Close merge request"
+      - if @merge_request.closed?
+        = link_to 'Reopen', project_merge_request_path(@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"
+
+  .diffs.tab-content
+    - if current_page?(action: 'diffs')
+      = render "projects/merge_requests/show/diffs"
+  .notes.tab-content.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }
+    .row
+      .col-sm-9
+        = render "projects/notes/notes_with_form"
+  .mr-loading-status
+    = spinner
 
 
 :javascript