From 6b0e4783530f58d7bd9e425f21c170b83a8d0dfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20D=C3=A1vila?= Date: Sun, 7 Feb 2016 12:56:51 -0500 Subject: Some fixes required for conflicts on revert. --- app/services/commits/revert_service.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'app/services/commits/revert_service.rb') diff --git a/app/services/commits/revert_service.rb b/app/services/commits/revert_service.rb index 730e2017e8d..5ac2853019b 100644 --- a/app/services/commits/revert_service.rb +++ b/app/services/commits/revert_service.rb @@ -14,7 +14,9 @@ module Commits if commit success else - error("Something went wrong. Your changes were not committed") + error("Sorry, we cannot revert this commit automatically. + It may have already been reverted, or a more recent commit may + have updated some of its content.") end rescue Repository::CommitError, Gitlab::Git::Repository::InvalidBlobName, GitHooksService::PreReceiveError, ValidationError => ex error(ex.message) @@ -26,7 +28,7 @@ module Commits # Create branch with revert commit reverted = repository.revert(current_user, @commit, @target_branch, @create_merge_request) - unless @create_merge_request + if reverted && !@create_merge_request repository.rm_branch(current_user, @commit.revert_branch_name) end -- cgit v1.2.3