Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/services/commits/revert_service.rb')
-rw-r--r--app/services/commits/revert_service.rb8
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