diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-01-29 12:04:48 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-19 13:14:49 -0500 |
| commit | f56ee9d3b92d97560d3c35f25736556ae3861343 (patch) | |
| tree | 174ce043a502c505411922bbc27c5088d8d4e63f /app/controllers | |
| parent | 720e52d9d9d53854f21de6ce634fa26bd358c453 (diff) | |
| download | gitlab-ce-f56ee9d3b92d97560d3c35f25736556ae3861343.tar.gz | |
Save merge commit id when MR is merged
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index f886f3f566f..e89c869872f 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -193,7 +193,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController end def revert - @repository.find_or_create_branch(@merge_request.reverse_branch_name, @merge_request.target_branch) + @repository.revert_merge(current_user, @merge_request.merge_commit_sha, @merge_request.reverse_branch_name) url_params = { merge_request: { source_branch: @merge_request.reverse_branch_name, |