gitlab-org--gitlab-foss/app/services/merge_requests/squash_service.rb

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

46 lines
1.3 KiB
Ruby
Raw Normal View History

# frozen_string_literal: true
2018-05-29 09:51:43 +00:00
module MergeRequests
class SquashService < MergeRequests::BaseService
2019-02-06 12:33:11 +00:00
def execute
# If performing a squash would result in no change, then
# immediately return a success message without performing a squash
if merge_request.commits_count == 1 && message&.strip == merge_request.first_commit.safe_message&.strip
return success(squash_sha: merge_request.diff_head_sha)
end
2018-05-29 09:51:43 +00:00
return error(s_("MergeRequests|Squashing not allowed: This project doesn't allow you to squash commits when merging.")) if squash_forbidden?
squash! || error(s_('MergeRequests|Squashing failed: Squash the commits locally, resolve any conflicts, then push the branch.'))
2019-02-06 12:33:11 +00:00
end
private
def squash!
squash_sha = repository.squash(current_user, merge_request, message)
2018-05-29 09:51:43 +00:00
success(squash_sha: squash_sha)
rescue StandardError => e
log_error(exception: e, message: 'Failed to squash merge request')
2018-05-29 09:51:43 +00:00
false
end
2019-02-06 12:33:11 +00:00
def squash_forbidden?
target_project.squash_never?
end
2019-02-06 12:33:11 +00:00
def repository
target_project.repository
end
def merge_request
params[:merge_request]
end
def message
params[:squash_commit_message].presence || merge_request.default_squash_commit_message(user: current_user)
2019-02-06 12:33:11 +00:00
end
2018-05-29 09:51:43 +00:00
end
end