From 4dc835051705d5354645d39823b390f40175dbb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20D=C3=A1vila?= <rdavila84@gmail.com>
Date: Sun, 7 Feb 2016 23:43:22 -0500
Subject: [PATCH] Reuser revert commit modal in MR detail page.

---
 .../stylesheets/pages/merge_requests.scss     |  8 +++++++
 .../projects/merge_requests_controller.rb     | 21 -------------------
 .../projects/commit/_commit_box.html.haml     |  2 +-
 app/views/projects/commit/_revert.html.haml   |  2 +-
 app/views/projects/commit/show.html.haml      |  2 +-
 .../merge_requests/show/_mr_title.html.haml   |  4 +++-
 6 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 6b497cd56ed..7d5a226122d 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -237,3 +237,11 @@
     }
   }
 }
+
+// Revert Merge Request modal
+
+#modal-revert-commit {
+  .js-create-merge-request-container {
+    line-height: $line-height-base;
+  }
+}
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index e9d07614785..fc3b28c0f26 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -192,27 +192,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     end
   end
 
-  def revert
-    url_params = {
-      merge_request: { source_branch: @merge_request.revert_branch_name,
-                       target_branch: @merge_request.target_branch,
-                       source_project_id: @merge_request.target_project_id,
-                       target_project_id: @merge_request.target_project_id,
-                       description: @merge_request.revert_description }
-    }
-
-    if @merge_request.target_branch_exists? && @merge_request.merge_commit_sha.present?
-      @repository.revert_merge(current_user, @merge_request.merge_commit_sha,
-                               @merge_request.revert_branch_name, @merge_request.target_branch,
-                               @merge_request.revert_title)
-
-      redirect_to new_namespace_project_merge_request_url(@project.namespace, @project, url_params)
-    else
-      redirect_to namespace_project_merge_request_url(@project.namespace, @project, @merge_request),
-                  alert: 'Merge Request cannot be reverted because target branch was deleted.'
-    end
-  end
-
   def branch_from
     #This is always source
     @source_project = @merge_request.nil? ? @project : @merge_request.source_project
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index eab33e80c71..3dc0fefe407 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -17,7 +17,7 @@
       = icon('files-o')
       Browse Files
     - if can_collaborate_with_project?
-      = link_to '#modal-revert-commit', { 'data-target' => '#modal-revert-commit', 'data-toggle' => 'modal', class: 'btn btn-grouped'} do
+      = link_to '#modal-revert-commit', { 'data-target' => '#modal-revert-commit', 'data-toggle' => 'modal', class: 'btn btn-grouped btn-close'} do
         Revert
     - else
       - continue_params = { to:         namespace_project_commit_path(@project.namespace, @project, @commit.id),
diff --git a/app/views/projects/commit/_revert.html.haml b/app/views/projects/commit/_revert.html.haml
index 15f50724e8a..38ff21f0c0e 100644
--- a/app/views/projects/commit/_revert.html.haml
+++ b/app/views/projects/commit/_revert.html.haml
@@ -5,7 +5,7 @@
         %a.close{href: "#", "data-dismiss" => "modal"} ×
         %h3.page-title Revert commit
       .modal-body
-        = form_tag revert_namespace_project_commit_path(@project.namespace, @project, @commit.id), method: :post, remote: false, class: 'form-horizontal js-create-dir-form js-requires-input' do
+        = form_tag revert_namespace_project_commit_path(@project.namespace, @project, commit_id), method: :post, remote: false, class: 'form-horizontal js-create-dir-form js-requires-input' do
           .form-group.branch
             = label_tag 'target_branch', 'Target branch', class: 'control-label'
             .col-sm-10
diff --git a/app/views/projects/commit/show.html.haml b/app/views/projects/commit/show.html.haml
index 19101eec5b1..0666dfaf8f4 100644
--- a/app/views/projects/commit/show.html.haml
+++ b/app/views/projects/commit/show.html.haml
@@ -13,4 +13,4 @@
          diff_refs: @diff_refs
 = render "projects/notes/notes_with_form"
 - if can_collaborate_with_project?
-  = render "projects/commit/revert"
+  = render "projects/commit/revert", commit_id: @commit.id
diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml
index 5d29181631a..87cd50abdd9 100644
--- a/app/views/projects/merge_requests/show/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_title.html.haml
@@ -19,4 +19,6 @@
       - if @merge_request.closed?
         = link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: 'btn btn-nr btn-grouped btn-reopen reopen-mr-link', title: "Reopen merge request"
       - if @merge_request.merged? && @merge_request.merge_commit_sha.present?
-        = link_to 'Revert', revert_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), method: :post, class: "btn btn-grouped btn-close", title: "Revert merge request"
+        = render "projects/commit/revert", commit_id: @merge_request.merge_commit_sha
+        = link_to '#modal-revert-commit', { 'data-target' => '#modal-revert-commit', 'data-toggle' => 'modal', class: 'btn btn-grouped btn-close'} do
+          Revert