diff options
author | Rémy Coutable <remy@rymai.me> | 2016-09-15 17:30:27 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-09-15 17:30:27 +0300 |
commit | 0950d92df5d413f43ac6db53751589b597d4283c (patch) | |
tree | 36098c6a372991541abc421a0cddd51f739bf7d7 /app/services/commits/revert_service.rb | |
parent | 00f002edf2f80266550d58d6233de2d07f5248ca (diff) |
Reduce duplication in Commits::{CherryPickService,RevertService}
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/services/commits/revert_service.rb')
-rw-r--r-- | app/services/commits/revert_service.rb | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/app/services/commits/revert_service.rb b/app/services/commits/revert_service.rb index c7de9f6f35e..addd55cb32f 100644 --- a/app/services/commits/revert_service.rb +++ b/app/services/commits/revert_service.rb @@ -1,19 +1,7 @@ module Commits class RevertService < ChangeService def commit - revert_into = @create_merge_request ? @commit.revert_branch_name : @target_branch - revert_tree_id = repository.check_revert_content(@commit, @target_branch) - - if revert_tree_id - create_target_branch(revert_into) if @create_merge_request - - repository.revert(current_user, @commit, revert_into, revert_tree_id) - success - else - error_msg = "Sorry, we cannot revert this #{@commit.change_type_title} automatically. - It may have already been reverted, or a more recent commit may have updated some of its content." - raise ChangeError, error_msg - end + commit_change(:revert) end end end |