From ef591b87d157d29796e34968ac98e5a7a671b17e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20D=C3=A1vila?= Date: Sun, 7 Feb 2016 15:11:12 -0500 Subject: Fix commit message plus other little fix. --- app/models/commit.rb | 2 +- app/models/repository.rb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/models/commit.rb b/app/models/commit.rb index 05468451e1f..398041be3fd 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -220,7 +220,7 @@ class Commit end def revert_message - "Revert \"#{safe_message.lines.first}\"".truncate(80) + "\n\nReverts #{to_reference}" + "Revert \"#{safe_message.lines.first.chomp}\"".truncate(80) + "\n\nReverts #{to_reference}" end def is_a_merge_commit? diff --git a/app/models/repository.rb b/app/models/repository.rb index ca31a3f7ce6..c5da9b01f6b 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -628,8 +628,7 @@ class Repository target_sha = find_branch(target_branch).try(:target) # First make revert in temp branch - rm_branch(user, target_branch) if target_sha - success = revert_commit(user, commit, target_branch, base_branch) + success = target_sha ? true : revert_commit(user, commit, target_branch, base_branch) # Make the revert happen in the target branch source_sha = find_branch(target_branch).target -- cgit v1.2.1