diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-02-06 02:12:41 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-19 21:14:50 +0300 |
| commit | b36319a17cf82ee9782a572fab741938662a1c6b (patch) | |
| tree | 3c56b390b6d4bb06a5dd7dc9d6c6a2f602679cc9 /app/services/commits | |
| parent | 806139936898726b32c4fe216ac3a9f4419ce91e (diff) | |
Make MRs with revert commit work.
Diffstat (limited to 'app/services/commits')
| -rw-r--r-- | app/services/commits/revert_service.rb | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/app/services/commits/revert_service.rb b/app/services/commits/revert_service.rb index 4a364f0d86a..e1b88a9d848 100644 --- a/app/services/commits/revert_service.rb +++ b/app/services/commits/revert_service.rb @@ -4,8 +4,9 @@ module Commits def execute @source_project = params[:source_project] || @project - @target_branch = params[:target_branch] - @commit_to_revert = @source_project.commit(params[:revert_commit_id]) + @target_branch = params[:target_branch] + @commit = params[:commit] + @create_merge_request = params[:create_merge_request] # Check push permissions to branch validate @@ -23,10 +24,13 @@ module Commits raw_repo = repository.rugged # Create branch with revert commit - reverted = repository.revert(current_user, @commit_to_revert.id, - @commit_to_revert.revert_branch_name, @target_branch, - @commit_to_revert.revert_message) - repository.rm_branch(current_user, @commit_to_revert.revert_branch_name) + reverted = repository.revert(current_user, @commit.id, + @commit.revert_branch_name, @target_branch, + @commit.revert_message, @create_merge_request) + + unless @create_merge_request + repository.rm_branch(current_user, @commit.revert_branch_name) + end reverted end |