diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-02-10 01:16:15 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-19 21:14:52 +0300 |
| commit | 11345866d8ae3198c0f5523e8dee1e14cb21b3c7 (patch) | |
| tree | fc50d46bfff7af8710dc116d3fabc51b0f264a22 /app/services/commits/revert_service.rb | |
| parent | 328b52d58a36525fdc853f15877f87bcd7832d1c (diff) | |
Don't make Repository#revert aware of MRs.
Diffstat (limited to 'app/services/commits/revert_service.rb')
| -rw-r--r-- | app/services/commits/revert_service.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/services/commits/revert_service.rb b/app/services/commits/revert_service.rb index fa5262b47ef..6e8a7f8eabb 100644 --- a/app/services/commits/revert_service.rb +++ b/app/services/commits/revert_service.rb @@ -6,7 +6,7 @@ module Commits @source_project = params[:source_project] || @project @target_branch = params[:target_branch] @commit = params[:commit] - @create_merge_request = params[:create_merge_request] + @create_merge_request = params[:create_merge_request].present? # Check push permissions to branch validate @@ -23,7 +23,11 @@ module Commits end def commit - repository.revert(current_user, @commit, @target_branch, @create_merge_request) + if @create_merge_request + repository.revert(current_user, @commit, @target_branch, @commit.revert_branch_name) + else + repository.revert(current_user, @commit, @target_branch) + end end private |