Download as
Browse Code »

Commit d84b0fa6b5c84774e300e5fe6415defb30c441fe

Authored by Dmitriy Zaporozhets
1 parent 6a800832
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Add merge_commit_message argument for Satellite::MergeAction#merge

Showing 1 changed file with 4 additions and 9 deletions   Show diff stats
lib/gitlab/satellite/merge_action.rb
  Diff comments   View file @d84b0fa
... ... @@ -24,10 +24,10 @@ module Gitlab
24 24 # Returns false if the merge produced conflicts
25 25 # Returns false if pushing from the satellite to the repository failed or was rejected
26 26 # Returns true otherwise
27   - def merge!
  27 + def merge!(merge_commit_message = nil)
28 28 in_locked_and_timed_satellite do |merge_repo|
29 29 prepare_satellite!(merge_repo)
30   - if merge_in_satellite!(merge_repo)
  30 + if merge_in_satellite!(merge_repo, merge_commit_message)
31 31 # push merge back to bare repo
32 32 # will raise CommandFailed when push fails
33 33 merge_repo.git.push(default_options, :origin, merge_request.target_branch)
... ... @@ -114,16 +114,11 @@ module Gitlab
114 114 def merge_in_satellite!(repo, message = nil)
115 115 update_satellite_source_and_target!(repo)
116 116  
117   - merge_message = "Merge branch '#{merge_request.source_branch}' into '#{merge_request.target_branch}'"
118   -
119   - if message
120   - merge_message << "\n\n"
121   - merge_message << message
122   - end
  117 + message ||= "Merge branch '#{merge_request.source_branch}' into '#{merge_request.target_branch}'"
123 118  
124 119 # merge the source branch into the satellite
125 120 # will raise CommandFailed when merge fails
126   - repo.git.merge(default_options({no_ff: true}), "-m #{merge_message}", "source/#{merge_request.source_branch}")
  121 + repo.git.merge(default_options({no_ff: true}), "-m #{message}", "source/#{merge_request.source_branch}")
127 122 rescue Grit::Git::CommandFailed => ex
128 123 handle_exception(ex)
129 124 end
... ...