From b36319a17cf82ee9782a572fab741938662a1c6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20D=C3=A1vila?= Date: Fri, 5 Feb 2016 18:12:41 -0500 Subject: Make MRs with revert commit work. --- app/controllers/projects/commit_controller.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'app/controllers/projects/commit_controller.rb') diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index d996b0f4ca7..21579b5629d 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -93,10 +93,13 @@ class Projects::CommitController < Projects::ApplicationController end def assign_revert_commit_vars + @commit = project.commit(params[:id]) @target_branch = params[:target_branch] - + @mr_source_branch = @commit.revert_branch_name + @mr_target_branch = @target_branch @commit_params = { - revert_commit_id: params[:id], + commit: @commit, + create_merge_request: params[:create_merge_request].present? || different_project? } end end -- cgit v1.2.1