lib/gitlab/satellite/merge_action.rb
# Merges the source branch into the target branch in the satellite and
# pushes it back to the repository.
# It also removes the source branch if requested in the merge request (and this is permitted by the merge request).
#
# Returns false if the merge produced conflicts
# Returns false if pushing from the satellite to the repository failed or was rejected
# Returns true otherwise
Merges the source branch into the target branch in the satellite and
pushes it back to the repository.
It also removes the source branch if requested in the merge request (and this is permitted by the merge request).

Returns false if the merge produced conflicts
Returns false if pushing from the satellite to the repository failed or was rejected
Returns true otherwise
Merges the source branch into the target branch in the satellite and pushes it back to the repository . It also removes the source branch if requested in the merge request ( and this is permitted by the merge request ) . Returns false if the merge produced conflicts Returns false if pushing from the satellite to the repository failed or was rejected Returns true otherwise
def merge!(merge_commit_message = nil)
        in_locked_and_timed_satellite do |merge_repo|
          prepare_satellite!(merge_repo)
          if merge_in_satellite!(merge_repo, merge_commit_message)
            merge_repo.git.push(default_options, :origin, merge_request.target_branch)
            if merge_request.should_remove_source_branch && !project.root_ref?(merge_request.source_branch)
              merge_repo.git.push(default_options, :origin, ":#{merge_request.source_branch}")
            end
            true
          end
        end
      rescue Grit::Git::CommandFailed => ex
        handle_exception(ex)
      end
def merge! ( merge_commit_message = nil ) in_locked_and_timed_satellite do | merge_repo | prepare_satellite! ( merge_repo ) if merge_in_satellite! ( merge_repo , merge_commit_message ) merge_repo . git . push ( default_options , :origin , merge_request . target_branch ) if merge_request . should_remove_source_branch && ! project . root_ref? ( merge_request . source_branch ) merge_repo . git . push ( default_options , :origin , ":#{merge_request.source_branch}" ) end true end end rescue Grit :: Git :: CommandFailed => ex handle_exception ( ex ) end
Merges the source branch into the target branch in the satellite and
pushes it back to the repository.
Merges the source branch into the target branch in the satellite and pushes it back to the repository .
# push merge back to bare repo # will raise CommandFailed when push fails # remove source branch # will raise CommandFailed when push fails # merge, push and branch removal successful
merge_commit_message