BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit ef591b87 by Rubén Dávila Committed by Robert Speicher
Options

Fix commit message plus other little fix.

parent b0693318
Showing with 2 additions and 3 deletions
app/models/commit.rb
...@@ -220,7 +220,7 @@ class Commit ...@@ -220,7 +220,7 @@ class Commit
end end
def revert_message 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 end
def is_a_merge_commit? def is_a_merge_commit?
......
app/models/repository.rb
...@@ -628,8 +628,7 @@ class Repository ...@@ -628,8 +628,7 @@ class Repository
target_sha = find_branch(target_branch).try(:target) target_sha = find_branch(target_branch).try(:target)
# First make revert in temp branch # First make revert in temp branch
rm_branch(user, target_branch) if target_sha success = target_sha ? true : revert_commit(user, commit, target_branch, base_branch)
success = revert_commit(user, commit, target_branch, base_branch)
# Make the revert happen in the target branch # Make the revert happen in the target branch
source_sha = find_branch(target_branch).target source_sha = find_branch(target_branch).target
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment