lib/gitlab/satellite/merge_action.rb
def diff_in_satellite
        in_locked_and_timed_satellite do |merge_repo|
          prepare_satellite!(merge_repo)
          update_satellite_source_and_target!(merge_repo)
          diff = merge_repo.git.native(:diff, default_options, "origin/#{merge_request.target_branch}", "source/#{merge_request.source_branch}")
        end
      rescue Grit::Git::CommandFailed => ex
        handle_exception(ex)
      end
# Get a raw diff of the source to the target
Get a raw diff of the source to the target
Get a raw diff of the source to the target
def diff_in_satellite
        in_locked_and_timed_satellite do |merge_repo|
          prepare_satellite!(merge_repo)
          update_satellite_source_and_target!(merge_repo)
          diff = merge_repo.git.native(:diff, default_options, "origin/#{merge_request.target_branch}", "source/#{merge_request.source_branch}")
        end
      rescue Grit::Git::CommandFailed => ex
        handle_exception(ex)
      end
def diff_in_satellite in_locked_and_timed_satellite do | merge_repo | prepare_satellite! ( merge_repo ) update_satellite_source_and_target! ( merge_repo ) diff = merge_repo . git . native ( :diff , default_options , "origin/#{merge_request.target_branch}" , "source/#{merge_request.source_branch}" ) end rescue Grit :: Git :: CommandFailed => ex handle_exception ( ex ) end
Get a raw diff of the source to the target
Get a raw diff of the source to the target