Download as
Browse Code »

Commit e800fe0e50ff3766aa28f868b6650f330000d434

Authored by awiddersheim
1 parent 504777ec
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

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.
Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
lib/gitlab/satellite/merge_action.rb
  Diff comments   View file @e800fe0
... ... @@ -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
... ...