From e800fe0e50ff3766aa28f868b6650f330000d434 Mon Sep 17 00:00:00 2001
From: awiddersheim <awiddersheim@hotmail.com>
Date: Mon, 24 Feb 2014 20:53:57 -0500
Subject: [PATCH] Fix extra space added in beginning of commit message
Removes extra space in merge commit messages. This seems to have been
introduced by the functionality added in 38d8d749d which allows a user
to change a merge commit message.
---
lib/gitlab/satellite/merge_action.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/gitlab/satellite/merge_action.rb b/lib/gitlab/satellite/merge_action.rb
index 85615f282c4..5f17aa60b8b 100644
--- a/lib/gitlab/satellite/merge_action.rb
+++ b/lib/gitlab/satellite/merge_action.rb
@@ -118,7 +118,7 @@ module Gitlab
# merge the source branch into the satellite
# will raise CommandFailed when merge fails
- repo.git.merge(default_options({no_ff: true}), "-m #{message}", "source/#{merge_request.source_branch}")
+ repo.git.merge(default_options({no_ff: true}), "-m#{message}", "source/#{merge_request.source_branch}")
rescue Grit::Git::CommandFailed => ex
handle_exception(ex)
end
--
GitLab