diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-02-05 18:49:45 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-19 13:14:51 -0500 |
| commit | 91e6e32d130308496065d2efbf71d61e0eeff784 (patch) | |
| tree | 460d9980867c6739490dcfdb153f1940c61241f4 /app/services/commits | |
| parent | b36319a17cf82ee9782a572fab741938662a1c6b (diff) | |
| download | gitlab-ce-91e6e32d130308496065d2efbf71d61e0eeff784.tar.gz | |
Make it work for merge commits.
Diffstat (limited to 'app/services/commits')
| -rw-r--r-- | app/services/commits/revert_service.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/services/commits/revert_service.rb b/app/services/commits/revert_service.rb index e1b88a9d848..730e2017e8d 100644 --- a/app/services/commits/revert_service.rb +++ b/app/services/commits/revert_service.rb @@ -24,9 +24,7 @@ module Commits raw_repo = repository.rugged # Create branch with revert commit - reverted = repository.revert(current_user, @commit.id, - @commit.revert_branch_name, @target_branch, - @commit.revert_message, @create_merge_request) + reverted = repository.revert(current_user, @commit, @target_branch, @create_merge_request) unless @create_merge_request repository.rm_branch(current_user, @commit.revert_branch_name) |