From 70b05a83772abc59b3c914c84bc4d2c07749884d Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Tue, 13 Jun 2017 17:12:31 -0500
Subject: Split up MergeRequestsController

---
 app/views/projects/buttons/_dropdown.html.haml     |  2 +-
 app/views/projects/commits/_commits.html.haml      |  2 +-
 app/views/projects/diffs/_diffs.html.haml          |  2 +-
 app/views/projects/diffs/_warning.html.haml        | 13 ++-
 .../projects/merge_requests/_commits.html.haml     |  8 ++
 .../merge_requests/_how_to_merge.html.haml         | 63 ++++++++++++++
 .../projects/merge_requests/_mr_box.html.haml      | 13 +++
 .../projects/merge_requests/_mr_title.html.haml    | 35 ++++++++
 .../projects/merge_requests/_new_compare.html.haml | 75 -----------------
 .../projects/merge_requests/_new_diffs.html.haml   |  1 -
 .../projects/merge_requests/_new_submit.html.haml  | 58 -------------
 .../projects/merge_requests/_pipelines.html.haml   |  4 +
 app/views/projects/merge_requests/_show.html.haml  | 97 ---------------------
 .../projects/merge_requests/branch_from.html.haml  |  2 -
 .../projects/merge_requests/branch_to.html.haml    |  2 -
 .../projects/merge_requests/conflicts.html.haml    |  4 +-
 .../merge_requests/conflicts/show.html.haml        | 38 +++++++++
 .../merge_requests/creations/_diffs.html.haml      |  1 +
 .../creations/_new_compare.html.haml               | 75 +++++++++++++++++
 .../merge_requests/creations/_new_submit.html.haml | 57 +++++++++++++
 .../merge_requests/creations/branch_from.html.haml |  2 +
 .../merge_requests/creations/branch_to.html.haml   |  2 +
 .../merge_requests/creations/new.html.haml         |  6 ++
 .../creations/update_branches.html.haml            |  3 +
 app/views/projects/merge_requests/diffs.html.haml  |  1 -
 .../projects/merge_requests/diffs/_diffs.html.haml |  5 ++
 .../merge_requests/diffs/_versions.html.haml       | 97 +++++++++++++++++++++
 app/views/projects/merge_requests/index.html.haml  |  4 +-
 .../projects/merge_requests/invalid.html.haml      |  4 +-
 app/views/projects/merge_requests/new.html.haml    |  6 --
 app/views/projects/merge_requests/show.html.haml   | 98 +++++++++++++++++++++-
 .../merge_requests/show/_commits.html.haml         |  8 --
 .../projects/merge_requests/show/_diffs.html.haml  |  5 --
 .../merge_requests/show/_how_to_merge.html.haml    | 63 --------------
 .../projects/merge_requests/show/_mr_box.html.haml | 13 ---
 .../merge_requests/show/_mr_title.html.haml        | 35 --------
 .../merge_requests/show/_pipelines.html.haml       |  4 -
 .../merge_requests/show/_versions.html.haml        | 97 ---------------------
 .../merge_requests/update_branches.html.haml       |  3 -
 39 files changed, 521 insertions(+), 487 deletions(-)
 create mode 100644 app/views/projects/merge_requests/_commits.html.haml
 create mode 100644 app/views/projects/merge_requests/_how_to_merge.html.haml
 create mode 100644 app/views/projects/merge_requests/_mr_box.html.haml
 create mode 100644 app/views/projects/merge_requests/_mr_title.html.haml
 delete mode 100644 app/views/projects/merge_requests/_new_compare.html.haml
 delete mode 100644 app/views/projects/merge_requests/_new_diffs.html.haml
 delete mode 100644 app/views/projects/merge_requests/_new_submit.html.haml
 create mode 100644 app/views/projects/merge_requests/_pipelines.html.haml
 delete mode 100644 app/views/projects/merge_requests/_show.html.haml
 delete mode 100644 app/views/projects/merge_requests/branch_from.html.haml
 delete mode 100644 app/views/projects/merge_requests/branch_to.html.haml
 create mode 100644 app/views/projects/merge_requests/conflicts/show.html.haml
 create mode 100644 app/views/projects/merge_requests/creations/_diffs.html.haml
 create mode 100644 app/views/projects/merge_requests/creations/_new_compare.html.haml
 create mode 100644 app/views/projects/merge_requests/creations/_new_submit.html.haml
 create mode 100644 app/views/projects/merge_requests/creations/branch_from.html.haml
 create mode 100644 app/views/projects/merge_requests/creations/branch_to.html.haml
 create mode 100644 app/views/projects/merge_requests/creations/new.html.haml
 create mode 100644 app/views/projects/merge_requests/creations/update_branches.html.haml
 delete mode 100644 app/views/projects/merge_requests/diffs.html.haml
 create mode 100644 app/views/projects/merge_requests/diffs/_diffs.html.haml
 create mode 100644 app/views/projects/merge_requests/diffs/_versions.html.haml
 delete mode 100644 app/views/projects/merge_requests/new.html.haml
 delete mode 100644 app/views/projects/merge_requests/show/_commits.html.haml
 delete mode 100644 app/views/projects/merge_requests/show/_diffs.html.haml
 delete mode 100644 app/views/projects/merge_requests/show/_how_to_merge.html.haml
 delete mode 100644 app/views/projects/merge_requests/show/_mr_box.html.haml
 delete mode 100644 app/views/projects/merge_requests/show/_mr_title.html.haml
 delete mode 100644 app/views/projects/merge_requests/show/_pipelines.html.haml
 delete mode 100644 app/views/projects/merge_requests/show/_versions.html.haml
 delete mode 100644 app/views/projects/merge_requests/update_branches.html.haml

(limited to 'app/views/projects')

diff --git a/app/views/projects/buttons/_dropdown.html.haml b/app/views/projects/buttons/_dropdown.html.haml
index 960b57a8008..aa1a533b5cb 100644
--- a/app/views/projects/buttons/_dropdown.html.haml
+++ b/app/views/projects/buttons/_dropdown.html.haml
@@ -16,7 +16,7 @@
 
       - if merge_project
         %li
-          = link_to new_namespace_project_merge_request_path(merge_project.namespace, merge_project) do
+          = link_to namespace_project_new_merge_request_path(merge_project.namespace, merge_project) do
             = icon('tasks fw')
             #{ _('New merge request') }
 
diff --git a/app/views/projects/commits/_commits.html.haml b/app/views/projects/commits/_commits.html.haml
index 93fd0789c11..cf8dffc8957 100644
--- a/app/views/projects/commits/_commits.html.haml
+++ b/app/views/projects/commits/_commits.html.haml
@@ -8,7 +8,7 @@
 
   %li.commits-row{ data: { day: day } }
     %ul.content-list.commit-list
-      = render commits, project: project, ref: ref
+      = render partial: 'projects/commits/commit', collection: commits, locals: { project: project, ref: ref }
 
 - if hidden > 0
   %li.alert.alert-warning
diff --git a/app/views/projects/diffs/_diffs.html.haml b/app/views/projects/diffs/_diffs.html.haml
index d538c4c86c8..f9385459a66 100644
--- a/app/views/projects/diffs/_diffs.html.haml
+++ b/app/views/projects/diffs/_diffs.html.haml
@@ -10,7 +10,7 @@
     - if show_whitespace_toggle
       - if current_controller?(:commit)
         = commit_diff_whitespace_link(diffs.project, @commit, class: 'hidden-xs')
-      - elsif current_controller?(:merge_requests)
+      - elsif current_controller?('projects/merge_requests/diffs')
         = diff_merge_request_whitespace_link(diffs.project, @merge_request, class: 'hidden-xs')
       - elsif current_controller?(:compare)
         = diff_compare_whitespace_link(diffs.project, params[:from], params[:to], class: 'hidden-xs')
diff --git a/app/views/projects/diffs/_warning.html.haml b/app/views/projects/diffs/_warning.html.haml
index 295a1b62535..402c18c447e 100644
--- a/app/views/projects/diffs/_warning.html.haml
+++ b/app/views/projects/diffs/_warning.html.haml
@@ -2,13 +2,12 @@
   %h4
     Too many changes to show.
     .pull-right
-      - if current_controller?(:commit) or current_controller?(:merge_requests)
-        - if current_controller?(:commit)
-          = link_to "Plain diff", namespace_project_commit_path(@project.namespace, @project, @commit, format: :diff), class: "btn btn-sm"
-          = link_to "Email patch", namespace_project_commit_path(@project.namespace, @project, @commit, format: :patch), class: "btn btn-sm"
-        - elsif @merge_request && @merge_request.persisted?
-          = link_to "Plain diff", merge_request_path(@merge_request, format: :diff), class: "btn btn-sm"
-          = link_to "Email patch", merge_request_path(@merge_request, format: :patch), class: "btn btn-sm"
+      - if current_controller?(:commit)
+        = link_to "Plain diff", namespace_project_commit_path(@project.namespace, @project, @commit, format: :diff), class: "btn btn-sm"
+        = link_to "Email patch", namespace_project_commit_path(@project.namespace, @project, @commit, format: :patch), class: "btn btn-sm"
+      - elsif current_controller?('projects/merge_requests/diffs') && @merge_request&.persisted?
+        = link_to "Plain diff", merge_request_path(@merge_request, format: :diff), class: "btn btn-sm"
+        = link_to "Email patch", merge_request_path(@merge_request, format: :patch), class: "btn btn-sm"
   %p
     To preserve performance only
     %strong #{diff_files.size} of #{diff_files.real_size}
diff --git a/app/views/projects/merge_requests/_commits.html.haml b/app/views/projects/merge_requests/_commits.html.haml
new file mode 100644
index 00000000000..11793919ff7
--- /dev/null
+++ b/app/views/projects/merge_requests/_commits.html.haml
@@ -0,0 +1,8 @@
+- if @commits.empty?
+  .commits-empty
+    %h4
+      There are no commits yet.
+    = custom_icon ('illustration_no_commits')
+- else
+  %ol#commits-list.list-unstyled
+    = render "projects/commits/commits", project: @merge_request.source_project, ref: @merge_request.source_branch
diff --git a/app/views/projects/merge_requests/_how_to_merge.html.haml b/app/views/projects/merge_requests/_how_to_merge.html.haml
new file mode 100644
index 00000000000..766cb272bec
--- /dev/null
+++ b/app/views/projects/merge_requests/_how_to_merge.html.haml
@@ -0,0 +1,63 @@
+#modal_merge_info.modal
+  .modal-dialog
+    .modal-content
+      .modal-header
+        %a.close{ href: "#", "data-dismiss" => "modal" } ×
+        %h3 Check out, review, and merge locally
+      .modal-body
+        %p
+          %strong Step 1.
+          Fetch and check out the branch for this merge request
+        = clipboard_button(target: "pre#merge-info-1", title: "Copy commands to clipboard")
+        %pre.dark#merge-info-1
+          - if @merge_request.for_fork?
+            :preserve
+              git fetch #{h default_url_to_repo(@merge_request.source_project)} #{h @merge_request.source_branch}
+              git checkout -b #{h @merge_request.source_project_path}-#{h @merge_request.source_branch} FETCH_HEAD
+          - else
+            :preserve
+              git fetch origin
+              git checkout -b #{h @merge_request.source_branch} origin/#{h @merge_request.source_branch}
+        %p
+          %strong Step 2.
+          Review the changes locally
+
+        %p
+          %strong Step 3.
+          Merge the branch and fix any conflicts that come up
+        = clipboard_button(target: "pre#merge-info-3", title: "Copy commands to clipboard")
+        %pre.dark#merge-info-3
+          - if @merge_request.for_fork?
+            :preserve
+              git checkout #{h @merge_request.target_branch}
+              git merge --no-ff #{h @merge_request.source_project_path}-#{h @merge_request.source_branch}
+          - else
+            :preserve
+              git checkout #{h @merge_request.target_branch}
+              git merge --no-ff #{h @merge_request.source_branch}
+        %p
+          %strong Step 4.
+          Push the result of the merge to GitLab
+        = clipboard_button(target: "pre#merge-info-4", title: "Copy commands to clipboard")
+        %pre.dark#merge-info-4
+          :preserve
+            git push origin #{h @merge_request.target_branch}
+        - unless @merge_request.can_be_merged_by?(current_user)
+          %p
+            Note that pushing to GitLab requires write access to this repository.
+        %p
+          %strong Tip:
+          = succeed '.' do
+            You can also checkout merge requests locally by
+            = link_to 'following these guidelines', help_page_path('user/project/merge_requests/index.md', anchor: "checkout-merge-requests-locally"), target: '_blank', rel: 'noopener noreferrer'
+
+:javascript
+  $(function(){
+    var modal = $('#modal_merge_info').modal({modal: true, show:false});
+    $('.how_to_merge_link').bind("click", function(){
+      modal.show();
+    });
+    $('.modal-header .close').bind("click", function(){
+      modal.hide();
+    })
+  })
diff --git a/app/views/projects/merge_requests/_mr_box.html.haml b/app/views/projects/merge_requests/_mr_box.html.haml
new file mode 100644
index 00000000000..8a390cf8700
--- /dev/null
+++ b/app/views/projects/merge_requests/_mr_box.html.haml
@@ -0,0 +1,13 @@
+.detail-page-description.content-block
+  %h2.title
+    = markdown_field(@merge_request, :title)
+
+  %div
+    - if @merge_request.description.present?
+      .description{ class: can?(current_user, :update_merge_request, @merge_request) ? 'js-task-list-container' : '' }
+        .wiki
+          = markdown_field(@merge_request, :description)
+        %textarea.hidden.js-task-list-field
+          = @merge_request.description
+
+  = edited_time_ago_with_tooltip(@merge_request, placement: 'bottom')
diff --git a/app/views/projects/merge_requests/_mr_title.html.haml b/app/views/projects/merge_requests/_mr_title.html.haml
new file mode 100644
index 00000000000..d9428b8562e
--- /dev/null
+++ b/app/views/projects/merge_requests/_mr_title.html.haml
@@ -0,0 +1,35 @@
+- if @merge_request.closed_without_fork?
+  .alert.alert-danger
+    %p The source project of this merge request has been removed.
+
+.clearfix.detail-page-header
+  .issuable-header
+    .issuable-status-box.status-box{ class: status_box_class(@merge_request) }
+      = icon(@merge_request.state_icon_name, class: "hidden-sm hidden-md hidden-lg")
+      %span.hidden-xs
+        = @merge_request.state_human_name
+
+    %a.btn.btn-default.pull-right.visible-xs-block.gutter-toggle.issuable-gutter-toggle.js-sidebar-toggle{ href: "#" }
+      = icon('angle-double-left')
+
+    .issuable-meta
+      = issuable_meta(@merge_request, @project, "Merge request")
+
+  - if can?(current_user, :update_merge_request, @merge_request)
+    .issuable-actions
+      .clearfix.issue-btn-group.dropdown
+        %button.btn.btn-default.pull-left.hidden-md.hidden-lg{ type: "button", data: { toggle: "dropdown" } }
+          Options
+          = icon('caret-down')
+        .dropdown-menu.dropdown-menu-align-right.hidden-lg
+          %ul
+            %li{ class: merge_request_button_visibility(@merge_request, true) }
+              = link_to 'Close', merge_request_path(@merge_request, merge_request: { state_event: :close }), method: :put, title: 'Close merge request'
+            %li{ class: merge_request_button_visibility(@merge_request, false) }
+              = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: 'reopen-mr-link', title: 'Reopen merge request'
+            %li
+              = link_to 'Edit', edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'issuable-edit'
+        = link_to 'Close', merge_request_path(@merge_request, merge_request: { state_event: :close }), method: :put, class: "hidden-xs hidden-sm btn btn-grouped btn-close #{merge_request_button_visibility(@merge_request, true)}", title: 'Close merge request'
+        = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "hidden-xs hidden-sm btn btn-grouped btn-reopen reopen-mr-link #{merge_request_button_visibility(@merge_request, false)}", title: 'Reopen merge request'
+        = link_to edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "hidden-xs hidden-sm btn btn-grouped issuable-edit" do
+          Edit
diff --git a/app/views/projects/merge_requests/_new_compare.html.haml b/app/views/projects/merge_requests/_new_compare.html.haml
deleted file mode 100644
index 0f37abb579c..00000000000
--- a/app/views/projects/merge_requests/_new_compare.html.haml
+++ /dev/null
@@ -1,75 +0,0 @@
-%h3.page-title
-  New Merge Request
-
-= form_for [@project.namespace.becomes(Namespace), @project, @merge_request], url: new_namespace_project_merge_request_path(@project.namespace, @project), method: :get, html: { class: "merge-request-form form-inline js-requires-input" } do |f|
-  .hide.alert.alert-danger.mr-compare-errors
-  .merge-request-branches.row
-    .col-md-6
-      .panel.panel-default.panel-new-merge-request
-        .panel-heading
-          Source branch
-        .panel-body.clearfix
-          .merge-request-select.dropdown
-            = f.hidden_field :source_project_id
-            = dropdown_toggle @merge_request.source_project_path, { toggle: "dropdown", field_name: "#{f.object_name}[source_project_id]", disabled: @merge_request.persisted? }, { toggle_class: "js-compare-dropdown js-source-project" }
-            .dropdown-menu.dropdown-menu-selectable.dropdown-source-project
-              = dropdown_title("Select source project")
-              = dropdown_filter("Search projects")
-              = dropdown_content do
-                = render 'projects/merge_requests/dropdowns/project',
-                  projects: [@merge_request.source_project],
-                  selected: f.object.source_project_id
-          .merge-request-select.dropdown
-            = f.hidden_field :source_branch
-            = dropdown_toggle f.object.source_branch || "Select source branch", { toggle: "dropdown", field_name: "#{f.object_name}[source_branch]" }, { toggle_class: "js-compare-dropdown js-source-branch git-revision-dropdown-toggle" }
-            .dropdown-menu.dropdown-menu-selectable.dropdown-source-branch.git-revision-dropdown
-              = dropdown_title("Select source branch")
-              = dropdown_filter("Search branches")
-              = dropdown_content do
-                = render 'projects/merge_requests/dropdowns/branch',
-                  branches: @merge_request.source_branches,
-                  selected: f.object.source_branch
-        .panel-footer
-          .text-center= icon('spinner spin', class: 'js-source-loading')
-          %ul.list-unstyled.mr_source_commit
-
-    .col-md-6
-      .panel.panel-default.panel-new-merge-request
-        .panel-heading
-          Target branch
-        .panel-body.clearfix
-          - projects = target_projects(@project)
-          .merge-request-select.dropdown
-            = f.hidden_field :target_project_id
-            = dropdown_toggle f.object.target_project.path_with_namespace, { toggle: "dropdown", field_name: "#{f.object_name}[target_project_id]", disabled: @merge_request.persisted? }, { toggle_class: "js-compare-dropdown js-target-project" }
-            .dropdown-menu.dropdown-menu-selectable.dropdown-target-project
-              = dropdown_title("Select target project")
-              = dropdown_filter("Search projects")
-              = dropdown_content do
-                = render 'projects/merge_requests/dropdowns/project',
-                  projects: projects,
-                  selected: f.object.target_project_id
-          .merge-request-select.dropdown
-            = f.hidden_field :target_branch
-            = dropdown_toggle f.object.target_branch, { toggle: "dropdown", field_name: "#{f.object_name}[target_branch]" }, { toggle_class: "js-compare-dropdown js-target-branch git-revision-dropdown-toggle" }
-            .dropdown-menu.dropdown-menu-selectable.dropdown-target-branch.js-target-branch-dropdown.git-revision-dropdown
-              = dropdown_title("Select target branch")
-              = dropdown_filter("Search branches")
-              = dropdown_content do
-                = render 'projects/merge_requests/dropdowns/branch',
-                  branches: @merge_request.target_branches,
-                  selected: f.object.target_branch
-        .panel-footer
-          .text-center= icon('spinner spin', class: "js-target-loading")
-          %ul.list-unstyled.mr_target_commit
-
-  - if @merge_request.errors.any?
-    = form_errors(@merge_request)
-  = f.submit 'Compare branches and continue', class: "btn btn-new mr-compare-btn"
-
-:javascript
-  new Compare({
-    targetProjectUrl: "#{update_branches_namespace_project_merge_requests_path(@source_project.namespace, @source_project)}",
-    sourceBranchUrl: "#{branch_from_namespace_project_merge_requests_path(@source_project.namespace, @source_project)}",
-    targetBranchUrl: "#{branch_to_namespace_project_merge_requests_path(@source_project.namespace, @source_project)}"
-  });
diff --git a/app/views/projects/merge_requests/_new_diffs.html.haml b/app/views/projects/merge_requests/_new_diffs.html.haml
deleted file mode 100644
index 627fc4e9671..00000000000
--- a/app/views/projects/merge_requests/_new_diffs.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= render "projects/diffs/diffs", diffs: @diffs, environment: @environment, show_whitespace_toggle: false
diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml
deleted file mode 100644
index e3ecbee5490..00000000000
--- a/app/views/projects/merge_requests/_new_submit.html.haml
+++ /dev/null
@@ -1,58 +0,0 @@
-%h3.page-title
-  New Merge Request
-%p.slead
-  - source_title, target_title = format_mr_branch_names(@merge_request)
-  From
-  %strong.ref-name= source_title
-  %span into
-  %strong.ref-name= target_title
-
-  %span.pull-right
-    = link_to 'Change branches', mr_change_branches_path(@merge_request)
-%hr
-= form_for [@project.namespace.becomes(Namespace), @project, @merge_request], html: { class: 'merge-request-form form-horizontal common-note-form js-requires-input js-quick-submit' } do |f|
-  = render 'shared/issuable/form', f: f, issuable: @merge_request, commits: @commits
-  = f.hidden_field :source_project_id
-  = f.hidden_field :source_branch
-  = f.hidden_field :target_project_id
-  = f.hidden_field :target_branch
-
-.mr-compare.merge-request
-  - if @commits.empty?
-    .commits-empty
-      %h4
-        There are no commits yet.
-      = custom_icon ('illustration_no_commits')
-  - else
-    %ul.merge-request-tabs.nav-links.no-top.no-bottom
-      %li.commits-tab.active
-        = link_to url_for(params), data: {target: 'div#commits', action: 'new', toggle: 'tab'} do
-          Commits
-          %span.badge= @commits.size
-      - if @pipelines.any?
-        %li.builds-tab
-          = link_to url_for(params), data: {target: 'div#pipelines', action: 'pipelines', toggle: 'tab'} do
-            Pipelines
-            %span.badge= @pipelines.size
-      %li.diffs-tab
-        = link_to url_for(params.merge(action: 'new_diffs')), data: {target: 'div#diffs', action: 'new/diffs', toggle: 'tab'} do
-          Changes
-          %span.badge= @merge_request.diff_size
-
-    .tab-content
-      #commits.commits.tab-pane.active
-        = render "projects/merge_requests/show/commits"
-      #diffs.diffs.tab-pane
-        -# This tab is always loaded via AJAX
-      - if @pipelines.any?
-        #pipelines.pipelines.tab-pane
-          = render 'projects/merge_requests/show/pipelines', endpoint: url_for(params.merge(format: :json)), disable_initialization: true
-
-  .mr-loading-status
-    = spinner
-
-:javascript
-  var merge_request = new MergeRequest({
-    action: "#{(@show_changes_tab ? 'new/diffs' : 'new')}",
-    setUrl: false,
-  });
diff --git a/app/views/projects/merge_requests/_pipelines.html.haml b/app/views/projects/merge_requests/_pipelines.html.haml
new file mode 100644
index 00000000000..2f1dbe87619
--- /dev/null
+++ b/app/views/projects/merge_requests/_pipelines.html.haml
@@ -0,0 +1,4 @@
+- endpoint_path = local_assigns[:endpoint] || pipelines_namespace_project_merge_request_path(@project.namespace, @project, @merge_request, format: :json)
+- disable_initialization = local_assigns.fetch(:disable_initialization, false)
+
+= render 'projects/commit/pipelines_list', endpoint: endpoint_path, disable_initialization: disable_initialization
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
deleted file mode 100644
index 75120409bb3..00000000000
--- a/app/views/projects/merge_requests/_show.html.haml
+++ /dev/null
@@ -1,97 +0,0 @@
-- @content_class = "limit-container-width" unless fluid_layout
-- page_title "#{@merge_request.title} (#{@merge_request.to_reference})", "Merge Requests"
-- page_description @merge_request.description
-- page_card_attributes @merge_request.card_attributes
-- content_for :page_specific_javascripts do
-  = page_specific_javascript_bundle_tag('common_vue')
-  = page_specific_javascript_bundle_tag('diff_notes')
-
-.merge-request{ 'data-url' => merge_request_path(@merge_request, format: :json), 'data-project-path' => project_path(@merge_request.project) }
-  = render "projects/merge_requests/show/mr_title"
-
-  .merge-request-details.issuable-details{ data: { id: @merge_request.project.id } }
-    = render "projects/merge_requests/show/mr_box"
-
-    - if @merge_request.source_branch_exists?
-      = render "projects/merge_requests/show/how_to_merge"
-
-    :javascript
-      window.gl.mrWidgetData = #{serialize_issuable(@merge_request)}
-
-    #js-vue-mr-widget.mr-widget
-
-    - content_for :page_specific_javascripts do
-      = webpack_bundle_tag 'common_vue'
-      = webpack_bundle_tag 'vue_merge_request_widget'
-
-    .content-block.content-block-small.emoji-list-container
-      = render 'award_emoji/awards_block', awardable: @merge_request, inline: true
-
-    .merge-request-tabs-holder{ class: ("js-tabs-affix" unless ENV['RAILS_ENV'] == 'test') }
-      .merge-request-tabs-container
-        .scrolling-tabs-container.inner-page-scroll-tabs.is-smaller
-          .fade-left= icon('angle-left')
-          .fade-right= icon('angle-right')
-          .nav-links.scrolling-tabs
-            %ul.merge-request-tabs
-              %li.notes-tab
-                = link_to namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: { target: 'div#notes', action: 'notes', toggle: 'tab' } do
-                  Discussion
-                  %span.badge= @merge_request.related_notes.user.count
-              - if @merge_request.source_project
-                %li.commits-tab
-                  = link_to commits_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: { target: 'div#commits', action: 'commits', toggle: 'tab' } do
-                    Commits
-                    %span.badge= @commits_count
-              - if @pipelines.any?
-                %li.pipelines-tab
-                  = link_to pipelines_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: { target: '#pipelines', action: 'pipelines', toggle: 'tab' } do
-                    Pipelines
-                    %span.badge= @pipelines.size
-              %li.diffs-tab
-                = link_to diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: { target: 'div#diffs', action: 'diffs', toggle: 'tab' } do
-                  Changes
-                  %span.badge= @merge_request.diff_size
-        #resolve-count-app.line-resolve-all-container.prepend-top-10{ "v-cloak" => true }
-          %resolve-count{ "inline-template" => true, ":logged-out" => "#{current_user.nil?}" }
-            %div
-              .line-resolve-all{ "v-show" => "discussionCount > 0",
-                ":class" => "{ 'has-next-btn': !loggedOut && resolvedDiscussionCount !== discussionCount }" }
-                %span.line-resolve-btn.is-disabled{ type: "button",
-                    ":class" => "{ 'is-active': resolvedDiscussionCount === discussionCount }" }
-                  = render "shared/icons/icon_status_success.svg"
-                %span.line-resolve-text
-                  {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
-              = render "discussions/new_issue_for_all_discussions", merge_request: @merge_request
-              = render "discussions/jump_to_next"
-
-    .tab-content#diff-notes-app
-      #notes.notes.tab-pane.voting_notes
-        .row
-          %section.col-md-12
-            .issuable-discussion
-              = render "projects/merge_requests/discussion"
-
-      #commits.commits.tab-pane
-        -# This tab is always loaded via AJAX
-      #pipelines.pipelines.tab-pane
-        - if @pipelines.any?
-          = render 'projects/commit/pipelines_list', disable_initialization: true, endpoint: pipelines_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)
-      #diffs.diffs.tab-pane
-        -# This tab is always loaded via AJAX
-
-    .mr-loading-status
-      = spinner
-
-= render 'shared/issuable/sidebar', issuable: @merge_request
-- if @merge_request.can_be_reverted?(current_user)
-  = render "projects/commit/change", type: 'revert', commit: @merge_request.merge_commit, title: @merge_request.title
-- if @merge_request.can_be_cherry_picked?
-  = render "projects/commit/change", type: 'cherry-pick', commit: @merge_request.merge_commit, title: @merge_request.title
-
-:javascript
-  $(function () {
-    window.mergeRequest = new MergeRequest({
-      action: "#{controller.action_name}"
-    });
-  });
diff --git a/app/views/projects/merge_requests/branch_from.html.haml b/app/views/projects/merge_requests/branch_from.html.haml
deleted file mode 100644
index 3837c4b388d..00000000000
--- a/app/views/projects/merge_requests/branch_from.html.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-- if @commit
-  = commit_to_html(@commit, @ref, @source_project)
diff --git a/app/views/projects/merge_requests/branch_to.html.haml b/app/views/projects/merge_requests/branch_to.html.haml
deleted file mode 100644
index d69b71790a0..00000000000
--- a/app/views/projects/merge_requests/branch_to.html.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-- if @commit
-  = commit_to_html(@commit, @ref, @target_project)
diff --git a/app/views/projects/merge_requests/conflicts.html.haml b/app/views/projects/merge_requests/conflicts.html.haml
index 51d59280be8..f016b9c13b3 100644
--- a/app/views/projects/merge_requests/conflicts.html.haml
+++ b/app/views/projects/merge_requests/conflicts.html.haml
@@ -3,10 +3,10 @@
   = page_specific_javascript_bundle_tag('common_vue')
   = page_specific_javascript_bundle_tag('merge_conflicts')
   = page_specific_javascript_tag('lib/ace.js')
-= render "projects/merge_requests/show/mr_title"
+= render "projects/merge_requests/mr_title"
 
 .merge-request-details.issuable-details
-  = render "projects/merge_requests/show/mr_box"
+  = render "projects/merge_requests/mr_box"
 
 = render 'shared/issuable/sidebar', issuable: @merge_request
 
diff --git a/app/views/projects/merge_requests/conflicts/show.html.haml b/app/views/projects/merge_requests/conflicts/show.html.haml
new file mode 100644
index 00000000000..f016b9c13b3
--- /dev/null
+++ b/app/views/projects/merge_requests/conflicts/show.html.haml
@@ -0,0 +1,38 @@
+- page_title "Merge Conflicts", "#{@merge_request.title} (#{@merge_request.to_reference}", "Merge Requests"
+- content_for :page_specific_javascripts do
+  = page_specific_javascript_bundle_tag('common_vue')
+  = page_specific_javascript_bundle_tag('merge_conflicts')
+  = page_specific_javascript_tag('lib/ace.js')
+= render "projects/merge_requests/mr_title"
+
+.merge-request-details.issuable-details
+  = render "projects/merge_requests/mr_box"
+
+= render 'shared/issuable/sidebar', issuable: @merge_request
+
+#conflicts{ "v-cloak" => "true", data: { conflicts_path: conflicts_namespace_project_merge_request_path(@merge_request.project.namespace, @merge_request.project, @merge_request, format: :json),
+    resolve_conflicts_path: resolve_conflicts_namespace_project_merge_request_path(@merge_request.project.namespace, @merge_request.project, @merge_request) } }
+  .loading{ "v-if" => "isLoading" }
+    %i.fa.fa-spinner.fa-spin
+
+  .nothing-here-block{ "v-if" => "hasError" }
+    {{conflictsData.errorMessage}}
+
+  = render partial: "projects/merge_requests/conflicts/commit_stats"
+
+  .files-wrapper{ "v-if" => "!isLoading && !hasError" }
+    .files
+      .diff-file.file-holder.conflict{ "v-for" => "file in conflictsData.files" }
+        .js-file-title.file-title
+          %i.fa.fa-fw{ ":class" => "file.iconClass" }
+          %strong {{file.filePath}}
+          = render partial: 'projects/merge_requests/conflicts/file_actions'
+        .diff-content.diff-wrap-lines
+          .diff-wrap-lines.code.file-content.js-syntax-highlight{ "v-show" => "!isParallel && file.resolveMode === 'interactive' && file.type === 'text'" }
+            = render partial: "projects/merge_requests/conflicts/components/inline_conflict_lines"
+          .diff-wrap-lines.code.file-content.js-syntax-highlight{ "v-show" => "isParallel && file.resolveMode === 'interactive' && file.type === 'text'" }
+            %parallel-conflict-lines{ ":file" => "file" }
+          %div{ "v-show" => "file.resolveMode === 'edit' ||  file.type === 'text-editor'" }
+            = render partial: "projects/merge_requests/conflicts/components/diff_file_editor"
+
+    = render partial: "projects/merge_requests/conflicts/submit_form"
diff --git a/app/views/projects/merge_requests/creations/_diffs.html.haml b/app/views/projects/merge_requests/creations/_diffs.html.haml
new file mode 100644
index 00000000000..627fc4e9671
--- /dev/null
+++ b/app/views/projects/merge_requests/creations/_diffs.html.haml
@@ -0,0 +1 @@
+= render "projects/diffs/diffs", diffs: @diffs, environment: @environment, show_whitespace_toggle: false
diff --git a/app/views/projects/merge_requests/creations/_new_compare.html.haml b/app/views/projects/merge_requests/creations/_new_compare.html.haml
new file mode 100644
index 00000000000..7cda326afef
--- /dev/null
+++ b/app/views/projects/merge_requests/creations/_new_compare.html.haml
@@ -0,0 +1,75 @@
+%h3.page-title
+  New Merge Request
+
+= form_for [@project.namespace.becomes(Namespace), @project, @merge_request], url: namespace_project_new_merge_request_path(@project.namespace, @project), method: :get, html: { class: "merge-request-form form-inline js-requires-input" } do |f|
+  .hide.alert.alert-danger.mr-compare-errors
+  .merge-request-branches.row
+    .col-md-6
+      .panel.panel-default.panel-new-merge-request
+        .panel-heading
+          Source branch
+        .panel-body.clearfix
+          .merge-request-select.dropdown
+            = f.hidden_field :source_project_id
+            = dropdown_toggle @merge_request.source_project_path, { toggle: "dropdown", field_name: "#{f.object_name}[source_project_id]", disabled: @merge_request.persisted? }, { toggle_class: "js-compare-dropdown js-source-project" }
+            .dropdown-menu.dropdown-menu-selectable.dropdown-source-project
+              = dropdown_title("Select source project")
+              = dropdown_filter("Search projects")
+              = dropdown_content do
+                = render 'projects/merge_requests/dropdowns/project',
+                  projects: [@merge_request.source_project],
+                  selected: f.object.source_project_id
+          .merge-request-select.dropdown
+            = f.hidden_field :source_branch
+            = dropdown_toggle f.object.source_branch || "Select source branch", { toggle: "dropdown", field_name: "#{f.object_name}[source_branch]" }, { toggle_class: "js-compare-dropdown js-source-branch git-revision-dropdown-toggle" }
+            .dropdown-menu.dropdown-menu-selectable.dropdown-source-branch.git-revision-dropdown
+              = dropdown_title("Select source branch")
+              = dropdown_filter("Search branches")
+              = dropdown_content do
+                = render 'projects/merge_requests/dropdowns/branch',
+                  branches: @merge_request.source_branches,
+                  selected: f.object.source_branch
+        .panel-footer
+          .text-center= icon('spinner spin', class: 'js-source-loading')
+          %ul.list-unstyled.mr_source_commit
+
+    .col-md-6
+      .panel.panel-default.panel-new-merge-request
+        .panel-heading
+          Target branch
+        .panel-body.clearfix
+          - projects = target_projects(@project)
+          .merge-request-select.dropdown
+            = f.hidden_field :target_project_id
+            = dropdown_toggle f.object.target_project.path_with_namespace, { toggle: "dropdown", field_name: "#{f.object_name}[target_project_id]", disabled: @merge_request.persisted? }, { toggle_class: "js-compare-dropdown js-target-project" }
+            .dropdown-menu.dropdown-menu-selectable.dropdown-target-project
+              = dropdown_title("Select target project")
+              = dropdown_filter("Search projects")
+              = dropdown_content do
+                = render 'projects/merge_requests/dropdowns/project',
+                  projects: projects,
+                  selected: f.object.target_project_id
+          .merge-request-select.dropdown
+            = f.hidden_field :target_branch
+            = dropdown_toggle f.object.target_branch, { toggle: "dropdown", field_name: "#{f.object_name}[target_branch]" }, { toggle_class: "js-compare-dropdown js-target-branch git-revision-dropdown-toggle" }
+            .dropdown-menu.dropdown-menu-selectable.dropdown-target-branch.js-target-branch-dropdown.git-revision-dropdown
+              = dropdown_title("Select target branch")
+              = dropdown_filter("Search branches")
+              = dropdown_content do
+                = render 'projects/merge_requests/dropdowns/branch',
+                  branches: @merge_request.target_branches,
+                  selected: f.object.target_branch
+        .panel-footer
+          .text-center= icon('spinner spin', class: "js-target-loading")
+          %ul.list-unstyled.mr_target_commit
+
+  - if @merge_request.errors.any?
+    = form_errors(@merge_request)
+  = f.submit 'Compare branches and continue', class: "btn btn-new mr-compare-btn"
+
+:javascript
+  new Compare({
+    targetProjectUrl: "#{namespace_project_new_merge_request_update_branches_path(@source_project.namespace, @source_project)}",
+    sourceBranchUrl: "#{namespace_project_new_merge_request_branch_from_path(@source_project.namespace, @source_project)}",
+    targetBranchUrl: "#{namespace_project_new_merge_request_branch_to_path(@source_project.namespace, @source_project)}"
+  });
diff --git a/app/views/projects/merge_requests/creations/_new_submit.html.haml b/app/views/projects/merge_requests/creations/_new_submit.html.haml
new file mode 100644
index 00000000000..c72dd1d8e29
--- /dev/null
+++ b/app/views/projects/merge_requests/creations/_new_submit.html.haml
@@ -0,0 +1,57 @@
+%h3.page-title
+  New Merge Request
+%p.slead
+  - source_title, target_title = format_mr_branch_names(@merge_request)
+  From
+  %strong.ref-name= source_title
+  %span into
+  %strong.ref-name= target_title
+
+  %span.pull-right
+    = link_to 'Change branches', mr_change_branches_path(@merge_request)
+%hr
+= form_for [@project.namespace.becomes(Namespace), @project, @merge_request], html: { class: 'merge-request-form form-horizontal common-note-form js-requires-input js-quick-submit' } do |f|
+  = render 'shared/issuable/form', f: f, issuable: @merge_request, commits: @commits
+  = f.hidden_field :source_project_id
+  = f.hidden_field :source_branch
+  = f.hidden_field :target_project_id
+  = f.hidden_field :target_branch
+
+.mr-compare.merge-request
+  - if @commits.empty?
+    .commits-empty
+      %h4
+        There are no commits yet.
+      = custom_icon ('illustration_no_commits')
+  - else
+    %ul.merge-request-tabs.nav-links.no-top.no-bottom
+      %li.commits-tab.active
+        = link_to url_for(params), data: {target: 'div#commits', action: 'new', toggle: 'tab'} do
+          Commits
+          %span.badge= @commits.size
+      - if @pipelines.any?
+        %li.builds-tab
+          = link_to url_for(params.merge(action: 'pipelines')), data: {target: 'div#pipelines', action: 'pipelines', toggle: 'tab'} do
+            Pipelines
+            %span.badge= @pipelines.size
+      %li.diffs-tab
+        = link_to url_for(params.merge(action: 'diffs')), data: {target: 'div#diffs', action: 'diffs', toggle: 'tab'} do
+          Changes
+          %span.badge= @merge_request.diff_size
+
+    .tab-content
+      #commits.commits.tab-pane.active
+        = render "projects/merge_requests/commits"
+      #diffs.diffs.tab-pane
+        -# This tab is always loaded via AJAX
+      - if @pipelines.any?
+        #pipelines.pipelines.tab-pane
+          = render 'projects/merge_requests/pipelines', endpoint: url_for(params.merge(action: 'pipelines', format: :json)), disable_initialization: true
+
+  .mr-loading-status
+    = spinner
+
+:javascript
+  var merge_request = new MergeRequest({
+    action: "#{j params[:tab].presence || 'new'}",
+  });
diff --git a/app/views/projects/merge_requests/creations/branch_from.html.haml b/app/views/projects/merge_requests/creations/branch_from.html.haml
new file mode 100644
index 00000000000..3837c4b388d
--- /dev/null
+++ b/app/views/projects/merge_requests/creations/branch_from.html.haml
@@ -0,0 +1,2 @@
+- if @commit
+  = commit_to_html(@commit, @ref, @source_project)
diff --git a/app/views/projects/merge_requests/creations/branch_to.html.haml b/app/views/projects/merge_requests/creations/branch_to.html.haml
new file mode 100644
index 00000000000..d69b71790a0
--- /dev/null
+++ b/app/views/projects/merge_requests/creations/branch_to.html.haml
@@ -0,0 +1,2 @@
+- if @commit
+  = commit_to_html(@commit, @ref, @target_project)
diff --git a/app/views/projects/merge_requests/creations/new.html.haml b/app/views/projects/merge_requests/creations/new.html.haml
new file mode 100644
index 00000000000..2e798ce780a
--- /dev/null
+++ b/app/views/projects/merge_requests/creations/new.html.haml
@@ -0,0 +1,6 @@
+- page_title "New Merge Request"
+
+- if @merge_request.can_be_created && !params[:change_branches]
+  = render 'new_submit'
+- else
+  = render 'new_compare'
diff --git a/app/views/projects/merge_requests/creations/update_branches.html.haml b/app/views/projects/merge_requests/creations/update_branches.html.haml
new file mode 100644
index 00000000000..64482973a89
--- /dev/null
+++ b/app/views/projects/merge_requests/creations/update_branches.html.haml
@@ -0,0 +1,3 @@
+= render 'projects/merge_requests/dropdowns/branch',
+branches: @target_branches,
+selected: nil
diff --git a/app/views/projects/merge_requests/diffs.html.haml b/app/views/projects/merge_requests/diffs.html.haml
deleted file mode 100644
index 2a5b8b1441e..00000000000
--- a/app/views/projects/merge_requests/diffs.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= render "show"
diff --git a/app/views/projects/merge_requests/diffs/_diffs.html.haml b/app/views/projects/merge_requests/diffs/_diffs.html.haml
new file mode 100644
index 00000000000..fb31e2fef00
--- /dev/null
+++ b/app/views/projects/merge_requests/diffs/_diffs.html.haml
@@ -0,0 +1,5 @@
+- if @merge_request_diff.collected? || @merge_request_diff.overflow?
+  = render 'projects/merge_requests/diffs/versions'
+  = render "projects/diffs/diffs", diffs: @diffs, environment: @environment
+- elsif @merge_request_diff.empty?
+  .nothing-here-block Nothing to merge from #{@merge_request.source_branch} into #{@merge_request.target_branch}
diff --git a/app/views/projects/merge_requests/diffs/_versions.html.haml b/app/views/projects/merge_requests/diffs/_versions.html.haml
new file mode 100644
index 00000000000..0999b95c9c9
--- /dev/null
+++ b/app/views/projects/merge_requests/diffs/_versions.html.haml
@@ -0,0 +1,97 @@
+- if @merge_request_diffs.size > 1
+  .mr-version-controls
+    .mr-version-menus-container.content-block
+      Changes between
+      %span.dropdown.inline.mr-version-dropdown
+        %a.dropdown-toggle.btn.btn-default{ data: {toggle: :dropdown} }
+          %span
+            - if @merge_request_diff.latest?
+              latest version
+            - else
+              version #{version_index(@merge_request_diff)}
+          = icon('caret-down')
+        .dropdown-menu.dropdown-select.dropdown-menu-selectable
+          .dropdown-title
+            %span Version:
+            %button.dropdown-title-button.dropdown-menu-close{ aria: { label: "Close" } }
+              = icon('times', class: 'dropdown-menu-close-icon')
+          .dropdown-content
+            %ul
+              - @merge_request_diffs.each do |merge_request_diff|
+                %li
+                  = link_to merge_request_version_path(@project, @merge_request, merge_request_diff, @start_sha), class: ('is-active' if merge_request_diff == @merge_request_diff) do
+                    %div
+                      %strong
+                        - if merge_request_diff.latest?
+                          latest version
+                        - else
+                          version #{version_index(merge_request_diff)}
+                    %div
+                      %small.commit-sha= short_sha(merge_request_diff.head_commit_sha)
+                    %div
+                      %small
+                        #{number_with_delimiter(merge_request_diff.commits_count)} #{'commit'.pluralize(merge_request_diff.commits_count)},
+                        = time_ago_with_tooltip(merge_request_diff.created_at)
+
+      - if @merge_request_diff.base_commit_sha
+        and
+        %span.dropdown.inline.mr-version-compare-dropdown
+          %a.btn.btn-default.dropdown-toggle{ data: {toggle: :dropdown} }
+            - if @start_version
+              version #{version_index(@start_version)}
+            - else
+              %span.ref-name= @merge_request.target_branch
+            = icon('caret-down')
+          .dropdown-menu.dropdown-select.dropdown-menu-selectable
+            .dropdown-title
+              %span Compared with:
+              %button.dropdown-title-button.dropdown-menu-close{ aria: { label: "Close" } }
+                = icon('times', class: 'dropdown-menu-close-icon')
+            .dropdown-content
+              %ul
+                - @comparable_diffs.each do |merge_request_diff|
+                  %li
+                    = link_to merge_request_version_path(@project, @merge_request, @merge_request_diff, merge_request_diff.head_commit_sha), class: ('is-active' if merge_request_diff == @start_version) do
+                      %div
+                        %strong
+                          - if merge_request_diff.latest?
+                            latest version
+                          - else
+                            version #{version_index(merge_request_diff)}
+                      %div
+                        %small.commit-sha= short_sha(merge_request_diff.head_commit_sha)
+                      %div
+                        %small
+                          = time_ago_with_tooltip(merge_request_diff.created_at)
+                %li
+                  = link_to merge_request_version_path(@project, @merge_request, @merge_request_diff), class: ('is-active' unless @start_version) do
+                    %div
+                      %strong
+                        %span.ref-name= @merge_request.target_branch
+                        (base)
+                    %div
+                      %strong.commit-sha= short_sha(@merge_request_diff.base_commit_sha)
+
+    - if different_base?(@start_version, @merge_request_diff)
+      .content-block
+        = icon('info-circle')
+        Selected versions have different base commits.
+        Changes will include
+        = link_to namespace_project_compare_path(@project.namespace, @project, from: @start_version.base_commit_sha, to: @merge_request_diff.base_commit_sha) do
+          new commits
+        from
+        = succeed '.' do
+          %code= @merge_request.target_branch
+
+    - if @start_version || !@merge_request_diff.latest?
+      .comments-disabled-notif.content-block
+        = icon('info-circle')
+        Not all comments are displayed because you're
+        - if @start_version
+          comparing two versions
+        - else
+          viewing an old version
+        of the diff.
+
+        .pull-right
+          = link_to 'Show latest version', diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'btn btn-sm'
diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml
index 6d75a9f34a3..86996e488a1 100644
--- a/app/views/projects/merge_requests/index.html.haml
+++ b/app/views/projects/merge_requests/index.html.haml
@@ -22,7 +22,7 @@
           = button_tag "Edit Merge Requests", class: "btn js-bulk-update-toggle"
         - merge_project = can?(current_user, :create_merge_request, @project) ? @project : (current_user && current_user.fork_of(@project))
         - if merge_project
-          = link_to new_namespace_project_merge_request_path(merge_project.namespace, merge_project), class: "btn btn-new", title: "New merge request" do
+          = link_to namespace_project_new_merge_request_path(merge_project.namespace, merge_project), class: "btn btn-new", title: "New merge request" do
             New merge request
 
     = render 'shared/issuable/search_bar', type: :merge_requests
@@ -33,4 +33,4 @@
     .merge-requests-holder
       = render 'merge_requests'
 - else
-  = render 'shared/empty_states/merge_requests', button_path: new_namespace_project_merge_request_path(@project.namespace, @project)
+  = render 'shared/empty_states/merge_requests', button_path: namespace_project_new_merge_request_path(@project.namespace, @project)
diff --git a/app/views/projects/merge_requests/invalid.html.haml b/app/views/projects/merge_requests/invalid.html.haml
index a00d3128ffe..6df19d6438b 100644
--- a/app/views/projects/merge_requests/invalid.html.haml
+++ b/app/views/projects/merge_requests/invalid.html.haml
@@ -1,8 +1,8 @@
 - page_title "#{@merge_request.title} (#{@merge_request.to_reference}", "Merge Requests"
 
 .merge-request
-  = render "projects/merge_requests/show/mr_title"
-  = render "projects/merge_requests/show/mr_box"
+  = render "projects/merge_requests/mr_title"
+  = render "projects/merge_requests/mr_box"
 
   .alert.alert-danger
     %p
diff --git a/app/views/projects/merge_requests/new.html.haml b/app/views/projects/merge_requests/new.html.haml
deleted file mode 100644
index 2e798ce780a..00000000000
--- a/app/views/projects/merge_requests/new.html.haml
+++ /dev/null
@@ -1,6 +0,0 @@
-- page_title "New Merge Request"
-
-- if @merge_request.can_be_created && !params[:change_branches]
-  = render 'new_submit'
-- else
-  = render 'new_compare'
diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml
index 2a5b8b1441e..dbbf1bde088 100644
--- a/app/views/projects/merge_requests/show.html.haml
+++ b/app/views/projects/merge_requests/show.html.haml
@@ -1 +1,97 @@
-= render "show"
+- @content_class = "limit-container-width" unless fluid_layout
+- page_title "#{@merge_request.title} (#{@merge_request.to_reference})", "Merge Requests"
+- page_description @merge_request.description
+- page_card_attributes @merge_request.card_attributes
+- content_for :page_specific_javascripts do
+  = page_specific_javascript_bundle_tag('common_vue')
+  = page_specific_javascript_bundle_tag('diff_notes')
+
+.merge-request{ 'data-url' => merge_request_path(@merge_request, format: :json), 'data-project-path' => project_path(@merge_request.project) }
+  = render "projects/merge_requests/mr_title"
+
+  .merge-request-details.issuable-details{ data: { id: @merge_request.project.id } }
+    = render "projects/merge_requests/mr_box"
+
+    - if @merge_request.source_branch_exists?
+      = render "projects/merge_requests/how_to_merge"
+
+    :javascript
+      window.gl.mrWidgetData = #{serialize_issuable(@merge_request)}
+
+    #js-vue-mr-widget.mr-widget
+
+    - content_for :page_specific_javascripts do
+      = webpack_bundle_tag 'common_vue'
+      = webpack_bundle_tag 'vue_merge_request_widget'
+
+    .content-block.content-block-small.emoji-list-container
+      = render 'award_emoji/awards_block', awardable: @merge_request, inline: true
+
+    .merge-request-tabs-holder{ class: ("js-tabs-affix" unless ENV['RAILS_ENV'] == 'test') }
+      .merge-request-tabs-container
+        .scrolling-tabs-container.inner-page-scroll-tabs.is-smaller
+          .fade-left= icon('angle-left')
+          .fade-right= icon('angle-right')
+          .nav-links.scrolling-tabs
+            %ul.merge-request-tabs
+              %li.notes-tab
+                = link_to namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: { target: 'div#notes', action: 'show', toggle: 'tab' } do
+                  Discussion
+                  %span.badge= @merge_request.related_notes.user.count
+              - if @merge_request.source_project
+                %li.commits-tab
+                  = link_to commits_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: { target: 'div#commits', action: 'commits', toggle: 'tab' } do
+                    Commits
+                    %span.badge= @commits_count
+              - if @pipelines.any?
+                %li.pipelines-tab
+                  = link_to pipelines_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: { target: '#pipelines', action: 'pipelines', toggle: 'tab' } do
+                    Pipelines
+                    %span.badge= @pipelines.size
+              %li.diffs-tab
+                = link_to diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: { target: 'div#diffs', action: 'diffs', toggle: 'tab' } do
+                  Changes
+                  %span.badge= @merge_request.diff_size
+        #resolve-count-app.line-resolve-all-container.prepend-top-10{ "v-cloak" => true }
+          %resolve-count{ "inline-template" => true, ":logged-out" => "#{current_user.nil?}" }
+            %div
+              .line-resolve-all{ "v-show" => "discussionCount > 0",
+                ":class" => "{ 'has-next-btn': !loggedOut && resolvedDiscussionCount !== discussionCount }" }
+                %span.line-resolve-btn.is-disabled{ type: "button",
+                    ":class" => "{ 'is-active': resolvedDiscussionCount === discussionCount }" }
+                  = render "shared/icons/icon_status_success.svg"
+                %span.line-resolve-text
+                  {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
+              = render "discussions/new_issue_for_all_discussions", merge_request: @merge_request
+              = render "discussions/jump_to_next"
+
+    .tab-content#diff-notes-app
+      #notes.notes.tab-pane.voting_notes
+        .row
+          %section.col-md-12
+            .issuable-discussion
+              = render "projects/merge_requests/discussion"
+
+      #commits.commits.tab-pane
+        -# This tab is always loaded via AJAX
+      #pipelines.pipelines.tab-pane
+        - if @pipelines.any?
+          = render 'projects/commit/pipelines_list', disable_initialization: true, endpoint: pipelines_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)
+      #diffs.diffs.tab-pane
+        -# This tab is always loaded via AJAX
+
+    .mr-loading-status
+      = spinner
+
+= render 'shared/issuable/sidebar', issuable: @merge_request
+- if @merge_request.can_be_reverted?(current_user)
+  = render "projects/commit/change", type: 'revert', commit: @merge_request.merge_commit, title: @merge_request.title
+- if @merge_request.can_be_cherry_picked?
+  = render "projects/commit/change", type: 'cherry-pick', commit: @merge_request.merge_commit, title: @merge_request.title
+
+:javascript
+  $(function () {
+    window.mergeRequest = new MergeRequest({
+      action: "#{j params[:tab].presence || 'show'}",
+    });
+  });
diff --git a/app/views/projects/merge_requests/show/_commits.html.haml b/app/views/projects/merge_requests/show/_commits.html.haml
deleted file mode 100644
index 11793919ff7..00000000000
--- a/app/views/projects/merge_requests/show/_commits.html.haml
+++ /dev/null
@@ -1,8 +0,0 @@
-- if @commits.empty?
-  .commits-empty
-    %h4
-      There are no commits yet.
-    = custom_icon ('illustration_no_commits')
-- else
-  %ol#commits-list.list-unstyled
-    = render "projects/commits/commits", project: @merge_request.source_project, ref: @merge_request.source_branch
diff --git a/app/views/projects/merge_requests/show/_diffs.html.haml b/app/views/projects/merge_requests/show/_diffs.html.haml
deleted file mode 100644
index 7f0913ea516..00000000000
--- a/app/views/projects/merge_requests/show/_diffs.html.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-- if @merge_request_diff.collected? || @merge_request_diff.overflow?
-  = render 'projects/merge_requests/show/versions'
-  = render "projects/diffs/diffs", diffs: @diffs, environment: @environment
-- elsif @merge_request_diff.empty?
-  .nothing-here-block Nothing to merge from #{@merge_request.source_branch} into #{@merge_request.target_branch}
diff --git a/app/views/projects/merge_requests/show/_how_to_merge.html.haml b/app/views/projects/merge_requests/show/_how_to_merge.html.haml
deleted file mode 100644
index 766cb272bec..00000000000
--- a/app/views/projects/merge_requests/show/_how_to_merge.html.haml
+++ /dev/null
@@ -1,63 +0,0 @@
-#modal_merge_info.modal
-  .modal-dialog
-    .modal-content
-      .modal-header
-        %a.close{ href: "#", "data-dismiss" => "modal" } ×
-        %h3 Check out, review, and merge locally
-      .modal-body
-        %p
-          %strong Step 1.
-          Fetch and check out the branch for this merge request
-        = clipboard_button(target: "pre#merge-info-1", title: "Copy commands to clipboard")
-        %pre.dark#merge-info-1
-          - if @merge_request.for_fork?
-            :preserve
-              git fetch #{h default_url_to_repo(@merge_request.source_project)} #{h @merge_request.source_branch}
-              git checkout -b #{h @merge_request.source_project_path}-#{h @merge_request.source_branch} FETCH_HEAD
-          - else
-            :preserve
-              git fetch origin
-              git checkout -b #{h @merge_request.source_branch} origin/#{h @merge_request.source_branch}
-        %p
-          %strong Step 2.
-          Review the changes locally
-
-        %p
-          %strong Step 3.
-          Merge the branch and fix any conflicts that come up
-        = clipboard_button(target: "pre#merge-info-3", title: "Copy commands to clipboard")
-        %pre.dark#merge-info-3
-          - if @merge_request.for_fork?
-            :preserve
-              git checkout #{h @merge_request.target_branch}
-              git merge --no-ff #{h @merge_request.source_project_path}-#{h @merge_request.source_branch}
-          - else
-            :preserve
-              git checkout #{h @merge_request.target_branch}
-              git merge --no-ff #{h @merge_request.source_branch}
-        %p
-          %strong Step 4.
-          Push the result of the merge to GitLab
-        = clipboard_button(target: "pre#merge-info-4", title: "Copy commands to clipboard")
-        %pre.dark#merge-info-4
-          :preserve
-            git push origin #{h @merge_request.target_branch}
-        - unless @merge_request.can_be_merged_by?(current_user)
-          %p
-            Note that pushing to GitLab requires write access to this repository.
-        %p
-          %strong Tip:
-          = succeed '.' do
-            You can also checkout merge requests locally by
-            = link_to 'following these guidelines', help_page_path('user/project/merge_requests/index.md', anchor: "checkout-merge-requests-locally"), target: '_blank', rel: 'noopener noreferrer'
-
-:javascript
-  $(function(){
-    var modal = $('#modal_merge_info').modal({modal: true, show:false});
-    $('.how_to_merge_link').bind("click", function(){
-      modal.show();
-    });
-    $('.modal-header .close').bind("click", function(){
-      modal.hide();
-    })
-  })
diff --git a/app/views/projects/merge_requests/show/_mr_box.html.haml b/app/views/projects/merge_requests/show/_mr_box.html.haml
deleted file mode 100644
index 8a390cf8700..00000000000
--- a/app/views/projects/merge_requests/show/_mr_box.html.haml
+++ /dev/null
@@ -1,13 +0,0 @@
-.detail-page-description.content-block
-  %h2.title
-    = markdown_field(@merge_request, :title)
-
-  %div
-    - if @merge_request.description.present?
-      .description{ class: can?(current_user, :update_merge_request, @merge_request) ? 'js-task-list-container' : '' }
-        .wiki
-          = markdown_field(@merge_request, :description)
-        %textarea.hidden.js-task-list-field
-          = @merge_request.description
-
-  = edited_time_ago_with_tooltip(@merge_request, placement: 'bottom')
diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml
deleted file mode 100644
index d9428b8562e..00000000000
--- a/app/views/projects/merge_requests/show/_mr_title.html.haml
+++ /dev/null
@@ -1,35 +0,0 @@
-- if @merge_request.closed_without_fork?
-  .alert.alert-danger
-    %p The source project of this merge request has been removed.
-
-.clearfix.detail-page-header
-  .issuable-header
-    .issuable-status-box.status-box{ class: status_box_class(@merge_request) }
-      = icon(@merge_request.state_icon_name, class: "hidden-sm hidden-md hidden-lg")
-      %span.hidden-xs
-        = @merge_request.state_human_name
-
-    %a.btn.btn-default.pull-right.visible-xs-block.gutter-toggle.issuable-gutter-toggle.js-sidebar-toggle{ href: "#" }
-      = icon('angle-double-left')
-
-    .issuable-meta
-      = issuable_meta(@merge_request, @project, "Merge request")
-
-  - if can?(current_user, :update_merge_request, @merge_request)
-    .issuable-actions
-      .clearfix.issue-btn-group.dropdown
-        %button.btn.btn-default.pull-left.hidden-md.hidden-lg{ type: "button", data: { toggle: "dropdown" } }
-          Options
-          = icon('caret-down')
-        .dropdown-menu.dropdown-menu-align-right.hidden-lg
-          %ul
-            %li{ class: merge_request_button_visibility(@merge_request, true) }
-              = link_to 'Close', merge_request_path(@merge_request, merge_request: { state_event: :close }), method: :put, title: 'Close merge request'
-            %li{ class: merge_request_button_visibility(@merge_request, false) }
-              = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: 'reopen-mr-link', title: 'Reopen merge request'
-            %li
-              = link_to 'Edit', edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'issuable-edit'
-        = link_to 'Close', merge_request_path(@merge_request, merge_request: { state_event: :close }), method: :put, class: "hidden-xs hidden-sm btn btn-grouped btn-close #{merge_request_button_visibility(@merge_request, true)}", title: 'Close merge request'
-        = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "hidden-xs hidden-sm btn btn-grouped btn-reopen reopen-mr-link #{merge_request_button_visibility(@merge_request, false)}", title: 'Reopen merge request'
-        = link_to edit_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "hidden-xs hidden-sm btn btn-grouped issuable-edit" do
-          Edit
diff --git a/app/views/projects/merge_requests/show/_pipelines.html.haml b/app/views/projects/merge_requests/show/_pipelines.html.haml
deleted file mode 100644
index 2f1dbe87619..00000000000
--- a/app/views/projects/merge_requests/show/_pipelines.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-- endpoint_path = local_assigns[:endpoint] || pipelines_namespace_project_merge_request_path(@project.namespace, @project, @merge_request, format: :json)
-- disable_initialization = local_assigns.fetch(:disable_initialization, false)
-
-= render 'projects/commit/pipelines_list', endpoint: endpoint_path, disable_initialization: disable_initialization
diff --git a/app/views/projects/merge_requests/show/_versions.html.haml b/app/views/projects/merge_requests/show/_versions.html.haml
deleted file mode 100644
index 0999b95c9c9..00000000000
--- a/app/views/projects/merge_requests/show/_versions.html.haml
+++ /dev/null
@@ -1,97 +0,0 @@
-- if @merge_request_diffs.size > 1
-  .mr-version-controls
-    .mr-version-menus-container.content-block
-      Changes between
-      %span.dropdown.inline.mr-version-dropdown
-        %a.dropdown-toggle.btn.btn-default{ data: {toggle: :dropdown} }
-          %span
-            - if @merge_request_diff.latest?
-              latest version
-            - else
-              version #{version_index(@merge_request_diff)}
-          = icon('caret-down')
-        .dropdown-menu.dropdown-select.dropdown-menu-selectable
-          .dropdown-title
-            %span Version:
-            %button.dropdown-title-button.dropdown-menu-close{ aria: { label: "Close" } }
-              = icon('times', class: 'dropdown-menu-close-icon')
-          .dropdown-content
-            %ul
-              - @merge_request_diffs.each do |merge_request_diff|
-                %li
-                  = link_to merge_request_version_path(@project, @merge_request, merge_request_diff, @start_sha), class: ('is-active' if merge_request_diff == @merge_request_diff) do
-                    %div
-                      %strong
-                        - if merge_request_diff.latest?
-                          latest version
-                        - else
-                          version #{version_index(merge_request_diff)}
-                    %div
-                      %small.commit-sha= short_sha(merge_request_diff.head_commit_sha)
-                    %div
-                      %small
-                        #{number_with_delimiter(merge_request_diff.commits_count)} #{'commit'.pluralize(merge_request_diff.commits_count)},
-                        = time_ago_with_tooltip(merge_request_diff.created_at)
-
-      - if @merge_request_diff.base_commit_sha
-        and
-        %span.dropdown.inline.mr-version-compare-dropdown
-          %a.btn.btn-default.dropdown-toggle{ data: {toggle: :dropdown} }
-            - if @start_version
-              version #{version_index(@start_version)}
-            - else
-              %span.ref-name= @merge_request.target_branch
-            = icon('caret-down')
-          .dropdown-menu.dropdown-select.dropdown-menu-selectable
-            .dropdown-title
-              %span Compared with:
-              %button.dropdown-title-button.dropdown-menu-close{ aria: { label: "Close" } }
-                = icon('times', class: 'dropdown-menu-close-icon')
-            .dropdown-content
-              %ul
-                - @comparable_diffs.each do |merge_request_diff|
-                  %li
-                    = link_to merge_request_version_path(@project, @merge_request, @merge_request_diff, merge_request_diff.head_commit_sha), class: ('is-active' if merge_request_diff == @start_version) do
-                      %div
-                        %strong
-                          - if merge_request_diff.latest?
-                            latest version
-                          - else
-                            version #{version_index(merge_request_diff)}
-                      %div
-                        %small.commit-sha= short_sha(merge_request_diff.head_commit_sha)
-                      %div
-                        %small
-                          = time_ago_with_tooltip(merge_request_diff.created_at)
-                %li
-                  = link_to merge_request_version_path(@project, @merge_request, @merge_request_diff), class: ('is-active' unless @start_version) do
-                    %div
-                      %strong
-                        %span.ref-name= @merge_request.target_branch
-                        (base)
-                    %div
-                      %strong.commit-sha= short_sha(@merge_request_diff.base_commit_sha)
-
-    - if different_base?(@start_version, @merge_request_diff)
-      .content-block
-        = icon('info-circle')
-        Selected versions have different base commits.
-        Changes will include
-        = link_to namespace_project_compare_path(@project.namespace, @project, from: @start_version.base_commit_sha, to: @merge_request_diff.base_commit_sha) do
-          new commits
-        from
-        = succeed '.' do
-          %code= @merge_request.target_branch
-
-    - if @start_version || !@merge_request_diff.latest?
-      .comments-disabled-notif.content-block
-        = icon('info-circle')
-        Not all comments are displayed because you're
-        - if @start_version
-          comparing two versions
-        - else
-          viewing an old version
-        of the diff.
-
-        .pull-right
-          = link_to 'Show latest version', diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'btn btn-sm'
diff --git a/app/views/projects/merge_requests/update_branches.html.haml b/app/views/projects/merge_requests/update_branches.html.haml
deleted file mode 100644
index 64482973a89..00000000000
--- a/app/views/projects/merge_requests/update_branches.html.haml
+++ /dev/null
@@ -1,3 +0,0 @@
-= render 'projects/merge_requests/dropdowns/branch',
-branches: @target_branches,
-selected: nil
-- 
cgit v1.2.1