Merge pull request #6405 from awiddersheim/fix_space_in_commit_message

Fix extra space added in beginning of commit message

Merge pull request #6405 from awiddersheim/fix_space_in_commit_message
Fix extra space added in beginning of commit message
Dmitriy Zaporozhets
2 parents d1547f86 e800fe0e
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
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
...	...	@@ -118,7 +118,7 @@ module Gitlab
118	118
119	119	# merge the source branch into the satellite
120	120	# will raise CommandFailed when merge fails
121		- repo.git.merge(default_options({no_ff: true}), "-m #{message}", "source/#{merge_request.source_branch}")
	121	+ repo.git.merge(default_options({no_ff: true}), "-m#{message}", "source/#{merge_request.source_branch}")
122	122	rescue Grit::Git::CommandFailed => ex
123	123	handle_exception(ex)
124	124	end
...	...