debian-mirror-gitlab/app/models/merge_request.rb

1446 lines
41 KiB
Ruby
Raw Normal View History

2018-11-18 11:00:15 +05:30
# frozen_string_literal: true
2019-07-07 11:18:12 +05:30
class MergeRequest < ApplicationRecord
2018-10-15 14:42:47 +05:30
include AtomicInternalId
2018-11-08 19:23:39 +05:30
include IidRoutes
2015-09-11 14:41:01 +05:30
include Issuable
2017-08-17 22:00:37 +05:30
include Noteable
2015-09-11 14:41:01 +05:30
include Referable
2018-11-08 19:23:39 +05:30
include Presentable
2018-03-17 18:26:18 +05:30
include TimeTrackable
include ManualInverseAssociation
include EachBatch
include ThrottledTouch
include Gitlab::Utils::StrongMemoize
2018-11-18 11:00:15 +05:30
include LabelEventable
include ReactiveCaching
2018-12-05 23:21:45 +05:30
include FromUnion
2019-07-31 22:56:46 +05:30
include DeprecatedAssignee
2018-11-18 11:00:15 +05:30
self.reactive_cache_key = ->(model) { [model.project.id, model.iid] }
self.reactive_cache_refresh_interval = 10.minutes
self.reactive_cache_lifetime = 10.minutes
2017-09-10 17:25:29 +05:30
2019-03-02 22:35:43 +05:30
SORTING_PREFERENCE_FIELD = :merge_requests_sort
2017-08-17 22:00:37 +05:30
belongs_to :target_project, class_name: "Project"
belongs_to :source_project, class_name: "Project"
2015-12-23 02:04:40 +05:30
belongs_to :merge_user, class_name: "User"
2014-09-02 18:07:02 +05:30
2018-10-15 14:42:47 +05:30
has_internal_id :iid, scope: :target_project, init: ->(s) { s&.target_project&.merge_requests&.maximum(:iid) }
2017-09-10 17:25:29 +05:30
has_many :merge_request_diffs
2018-03-17 18:26:18 +05:30
2016-09-29 09:46:39 +05:30
has_one :merge_request_diff,
2017-09-10 17:25:29 +05:30
-> { order('merge_request_diffs.id DESC') }, inverse_of: :merge_request
2018-03-17 18:26:18 +05:30
belongs_to :latest_merge_request_diff, class_name: 'MergeRequestDiff'
manual_inverse_association :latest_merge_request_diff, :merge_request
# This is the same as latest_merge_request_diff unless:
# 1. There are arguments - in which case we might be trying to force-reload.
# 2. This association is already loaded.
# 3. The latest diff does not exist.
#
# The second one in particular is important - MergeRequestDiff#merge_request
# is the inverse of MergeRequest#merge_request_diff, which means it may not be
# the latest diff, because we could have loaded any diff from this particular
# MR. If we haven't already loaded a diff, then it's fine to load the latest.
2019-02-15 15:39:39 +05:30
def merge_request_diff
fallback = latest_merge_request_diff unless association(:merge_request_diff).loaded?
2018-03-17 18:26:18 +05:30
fallback || super
end
2017-09-10 17:25:29 +05:30
belongs_to :head_pipeline, foreign_key: "head_pipeline_id", class_name: "Ci::Pipeline"
2014-09-02 18:07:02 +05:30
2017-09-10 17:25:29 +05:30
has_many :events, as: :target, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
2016-08-24 12:49:21 +05:30
2017-09-10 17:25:29 +05:30
has_many :merge_requests_closing_issues,
class_name: 'MergeRequestsClosingIssues',
dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent
2016-09-29 09:46:39 +05:30
2018-11-18 11:00:15 +05:30
has_many :cached_closes_issues, through: :merge_requests_closing_issues, source: :issue
2019-07-31 22:56:46 +05:30
has_many :pipelines_for_merge_request, foreign_key: 'merge_request_id', class_name: 'Ci::Pipeline'
2019-07-07 11:18:12 +05:30
has_many :suggestions, through: :notes
2018-11-18 11:00:15 +05:30
2019-07-07 11:18:12 +05:30
has_many :merge_request_assignees
2019-07-31 22:56:46 +05:30
has_many :assignees, class_name: "User", through: :merge_request_assignees
2017-08-17 22:00:37 +05:30
2019-10-31 01:37:42 +05:30
KNOWN_MERGE_PARAMS = [
:auto_merge_strategy,
:should_remove_source_branch,
:force_remove_source_branch,
:commit_message,
:squash_commit_message,
:sha
].freeze
2017-09-10 17:25:29 +05:30
serialize :merge_params, Hash # rubocop:disable Cop/ActiveRecordSerialize
2015-12-23 02:04:40 +05:30
2019-03-13 22:55:13 +05:30
after_create :ensure_merge_request_diff
2018-03-17 18:26:18 +05:30
after_update :clear_memoized_shas
2016-09-29 09:46:39 +05:30
after_update :reload_diff_if_branch_changed
2018-11-08 19:23:39 +05:30
after_save :ensure_metrics
2019-10-12 21:52:04 +05:30
after_commit :expire_etag_cache
2014-09-02 18:07:02 +05:30
# When this attribute is true some MR validation is ignored
# It allows us to close or modify broken merge requests
attr_accessor :allow_broken
# Temporary fields to store compare vars
# when creating new merge request
2016-11-03 12:29:30 +05:30
attr_accessor :can_be_created, :compare_commits, :diff_options, :compare
2016-06-02 11:05:42 +05:30
2014-09-02 18:07:02 +05:30
state_machine :state, initial: :opened do
event :close do
2017-09-10 17:25:29 +05:30
transition [:opened] => :closed
2014-09-02 18:07:02 +05:30
end
2015-09-25 12:07:36 +05:30
event :mark_as_merged do
2017-09-10 17:25:29 +05:30
transition [:opened, :locked] => :merged
2014-09-02 18:07:02 +05:30
end
event :reopen do
2017-09-10 17:25:29 +05:30
transition closed: :opened
2014-09-02 18:07:02 +05:30
end
event :lock_mr do
2017-09-10 17:25:29 +05:30
transition [:opened] => :locked
2014-09-02 18:07:02 +05:30
end
event :unlock_mr do
2017-09-10 17:25:29 +05:30
transition locked: :opened
2015-04-26 12:48:37 +05:30
end
2018-03-17 18:26:18 +05:30
before_transition any => :opened do |merge_request|
merge_request.merge_jid = nil
2019-02-15 15:39:39 +05:30
end
2018-03-17 18:26:18 +05:30
2019-02-15 15:39:39 +05:30
after_transition any => :opened do |merge_request|
2018-03-17 18:26:18 +05:30
merge_request.run_after_commit do
UpdateHeadPipelineForMergeRequestWorker.perform_async(merge_request.id)
end
end
2014-09-02 18:07:02 +05:30
state :opened
state :closed
state :merged
state :locked
end
state_machine :merge_status, initial: :unchecked do
event :mark_as_unchecked do
2018-11-08 19:23:39 +05:30
transition [:can_be_merged, :unchecked] => :unchecked
transition [:cannot_be_merged, :cannot_be_merged_recheck] => :cannot_be_merged_recheck
2014-09-02 18:07:02 +05:30
end
event :mark_as_mergeable do
2018-11-08 19:23:39 +05:30
transition [:unchecked, :cannot_be_merged_recheck] => :can_be_merged
2014-09-02 18:07:02 +05:30
end
event :mark_as_unmergeable do
2018-11-08 19:23:39 +05:30
transition [:unchecked, :cannot_be_merged_recheck] => :cannot_be_merged
2014-09-02 18:07:02 +05:30
end
state :unchecked
2018-11-08 19:23:39 +05:30
state :cannot_be_merged_recheck
2014-09-02 18:07:02 +05:30
state :can_be_merged
state :cannot_be_merged
2015-04-26 12:48:37 +05:30
around_transition do |merge_request, transition, block|
2016-08-24 12:49:21 +05:30
Gitlab::Timeless.timeless(merge_request, &block)
2015-04-26 12:48:37 +05:30
end
2018-11-08 19:23:39 +05:30
2018-12-05 23:21:45 +05:30
# rubocop: disable CodeReuse/ServiceClass
2018-11-08 19:23:39 +05:30
after_transition unchecked: :cannot_be_merged do |merge_request, transition|
if merge_request.notify_conflict?
NotificationService.new.merge_request_unmergeable(merge_request)
TodoService.new.merge_request_became_unmergeable(merge_request)
end
end
2018-12-05 23:21:45 +05:30
# rubocop: enable CodeReuse/ServiceClass
2018-11-08 19:23:39 +05:30
def check_state?(merge_status)
[:unchecked, :cannot_be_merged_recheck].include?(merge_status.to_sym)
end
2014-09-02 18:07:02 +05:30
end
2016-09-29 09:46:39 +05:30
validates :source_project, presence: true, unless: [:allow_broken, :importing?, :closed_without_fork?]
2014-09-02 18:07:02 +05:30
validates :source_branch, presence: true
validates :target_project, presence: true
validates :target_branch, presence: true
2019-09-04 21:01:54 +05:30
validates :merge_user, presence: true, if: :auto_merge_enabled?, unless: :importing?
2016-09-29 09:46:39 +05:30
validate :validate_branches, unless: [:allow_broken, :importing?, :closed_without_fork?]
validate :validate_fork, unless: :closed_without_fork?
2017-08-17 22:00:37 +05:30
validate :validate_target_project, on: :create
2014-09-02 18:07:02 +05:30
2017-08-17 22:00:37 +05:30
scope :by_source_or_target_branch, ->(branch_name) do
where("source_branch = :branch OR target_branch = :branch", branch: branch_name)
end
2014-09-02 18:07:02 +05:30
scope :by_milestone, ->(milestone) { where(milestone_id: milestone) }
scope :of_projects, ->(ids) { where(target_project_id: ids) }
2016-06-02 11:05:42 +05:30
scope :from_project, ->(project) { where(source_project_id: project.id) }
2015-09-11 14:41:01 +05:30
scope :merged, -> { with_state(:merged) }
scope :closed_and_merged, -> { with_states(:closed, :merged) }
2016-09-13 17:45:13 +05:30
scope :from_source_branches, ->(branches) { where(source_branch: branches) }
2018-03-17 18:26:18 +05:30
scope :by_commit_sha, ->(sha) do
where('EXISTS (?)', MergeRequestDiff.select(1).where('merge_requests.latest_merge_request_diff_id = merge_request_diffs.id').by_commit_sha(sha)).reorder(nil)
end
2015-12-23 02:04:40 +05:30
scope :join_project, -> { joins(:target_project) }
scope :references_project, -> { references(:target_project) }
2019-07-07 11:18:12 +05:30
scope :with_api_entity_associations, -> {
2019-07-31 22:56:46 +05:30
preload(:assignees, :author, :notes, :labels, :milestone, :timelogs,
2019-07-07 11:18:12 +05:30
latest_merge_request_diff: [:merge_request_diff_commits],
metrics: [:latest_closed_by, :merged_by],
target_project: [:route, { namespace: :route }],
source_project: [:route, { namespace: :route }])
}
2017-08-17 22:00:37 +05:30
2016-08-24 12:49:21 +05:30
after_save :keep_around_commit
2019-03-13 22:55:13 +05:30
alias_attribute :project, :target_project
alias_attribute :project_id, :target_project_id
2019-09-04 21:01:54 +05:30
alias_attribute :auto_merge_enabled, :merge_when_pipeline_succeeds
2019-10-12 21:52:04 +05:30
alias_method :issuing_parent, :target_project
2019-03-13 22:55:13 +05:30
2015-09-11 14:41:01 +05:30
def self.reference_prefix
'!'
end
2019-07-07 11:18:12 +05:30
def self.available_states
@available_states ||= super.merge(merged: 3, locked: 4)
end
# Returns the top 100 target branches
#
# The returned value is a Array containing branch names
# sort by updated_at of merge request:
#
# ['master', 'develop', 'production']
#
# limit - The maximum number of target branch to return.
def self.recent_target_branches(limit: 100)
group(:target_branch)
.select(:target_branch)
.reorder('MAX(merge_requests.updated_at) DESC')
.limit(limit)
.pluck(:target_branch)
end
2018-03-17 18:26:18 +05:30
def rebase_in_progress?
2019-10-12 21:52:04 +05:30
rebase_jid.present? && Gitlab::SidekiqStatus.running?(rebase_jid)
2018-03-17 18:26:18 +05:30
end
# Use this method whenever you need to make sure the head_pipeline is synced with the
# branch head commit, for example checking if a merge request can be merged.
# For more information check: https://gitlab.com/gitlab-org/gitlab-ce/issues/40004
def actual_head_pipeline
2019-07-07 11:18:12 +05:30
head_pipeline&.matches_sha_or_source_sha?(diff_head_sha) ? head_pipeline : nil
2018-03-17 18:26:18 +05:30
end
2018-12-13 13:39:08 +05:30
def merge_pipeline
return unless merged?
target_project.pipeline_for(target_branch, merge_commit_sha)
end
2015-09-11 14:41:01 +05:30
# Pattern used to extract `!123` merge request references from text
#
# This pattern supports cross-project references.
def self.reference_pattern
2016-06-02 11:05:42 +05:30
@reference_pattern ||= %r{
2015-09-11 14:41:01 +05:30
(#{Project.reference_pattern})?
#{Regexp.escape(reference_prefix)}(?<merge_request>\d+)
}x
end
2015-12-23 02:04:40 +05:30
def self.link_reference_pattern
2016-06-02 11:05:42 +05:30
@link_reference_pattern ||= super("merge_requests", /(?<merge_request>\d+)/)
end
2016-06-22 15:30:34 +05:30
def self.reference_valid?(reference)
reference.to_i > 0 && reference.to_i <= Gitlab::Database::MAX_INT_VALUE
end
2016-11-03 12:29:30 +05:30
def self.project_foreign_key
'target_project_id'
end
2016-06-02 11:05:42 +05:30
# Returns all the merge requests from an ActiveRecord:Relation.
#
# This method uses a UNION as it usually operates on the result of
# ProjectsFinder#execute. PostgreSQL in particular doesn't always like queries
# using multiple sub-queries especially when combined with an OR statement.
# UNIONs on the other hand perform much better in these cases.
#
# relation - An ActiveRecord::Relation that returns a list of Projects.
#
# Returns an ActiveRecord::Relation.
def self.in_projects(relation)
2017-08-17 22:00:37 +05:30
# unscoping unnecessary conditions that'll be applied
# when executing `where("merge_requests.id IN (#{union.to_sql})")`
2018-12-05 23:21:45 +05:30
source = unscoped.where(source_project_id: relation)
target = unscoped.where(target_project_id: relation)
2016-06-02 11:05:42 +05:30
2018-12-05 23:21:45 +05:30
from_union([source, target])
2018-03-17 18:26:18 +05:30
end
# This is used after project import, to reset the IDs to the correct
# values. It is not intended to be called without having already scoped the
# relation.
def self.set_latest_merge_request_diff_ids!
update = '
latest_merge_request_diff_id = (
SELECT MAX(id)
FROM merge_request_diffs
WHERE merge_requests.id = merge_request_diffs.merge_request_id
)'.squish
self.each_batch do |batch|
batch.update_all(update)
end
2015-12-23 02:04:40 +05:30
end
2018-12-05 23:21:45 +05:30
WIP_REGEX = /\A*(\[WIP\]\s*|WIP:\s*|WIP\s+)+\s*/i.freeze
2016-11-03 12:29:30 +05:30
def self.work_in_progress?(title)
!!(title =~ WIP_REGEX)
end
def self.wipless_title(title)
title.sub(WIP_REGEX, "")
end
def self.wip_title(title)
work_in_progress?(title) ? title : "WIP: #{title}"
end
2019-07-07 11:18:12 +05:30
def committers
@committers ||= commits.committers
2019-03-02 22:35:43 +05:30
end
2018-03-17 18:26:18 +05:30
# Verifies if title has changed not taking into account WIP prefix
# for merge requests.
def wipless_title_changed(old_title)
self.class.wipless_title(old_title) != self.wipless_title
end
def hook_attrs
Gitlab::HookData::MergeRequestBuilder.new(self).build
end
2017-08-17 22:00:37 +05:30
# `from` argument can be a Namespace or Project.
def to_reference(from = nil, full: false)
reference = "#{self.class.reference_prefix}#{iid}"
"#{project.to_reference(from, full: full)}#{reference}"
2015-09-11 14:41:01 +05:30
end
2014-09-02 18:07:02 +05:30
2017-09-10 17:25:29 +05:30
def commits
2019-03-02 22:35:43 +05:30
return merge_request_diff.commits if persisted?
commits_arr = if compare_commits
compare_commits.reverse
else
[]
end
CommitCollection.new(source_project, commits_arr, source_branch)
2017-09-10 17:25:29 +05:30
end
def commits_count
if persisted?
merge_request_diff.commits_count
elsif compare_commits
compare_commits.size
else
0
end
end
def commit_shas
if persisted?
merge_request_diff.commit_shas
elsif compare_commits
2018-03-17 18:26:18 +05:30
compare_commits.to_a.reverse.map(&:sha)
2017-09-10 17:25:29 +05:30
else
2018-03-17 18:26:18 +05:30
Array(diff_head_sha)
2017-09-10 17:25:29 +05:30
end
end
2018-12-13 13:39:08 +05:30
# Returns true if there are commits that match at least one commit SHA.
def includes_any_commits?(shas)
if persisted?
merge_request_diff.commits_by_shas(shas).exists?
else
(commit_shas & shas).present?
end
end
2019-02-15 15:39:39 +05:30
def supports_suggestion?
true
end
2018-03-17 18:26:18 +05:30
# Calls `MergeWorker` to proceed with the merge process and
# updates `merge_jid` with the MergeWorker#jid.
# This helps tracking enqueued and ongoing merge jobs.
def merge_async(user_id, params)
2018-10-15 14:42:47 +05:30
jid = MergeWorker.perform_async(id, user_id, params.to_h)
2018-03-17 18:26:18 +05:30
update_column(:merge_jid, jid)
2019-10-12 21:52:04 +05:30
# merge_ongoing? depends on merge_jid
# expire etag cache since the attribute is changed without triggering callbacks
expire_etag_cache
2018-03-17 18:26:18 +05:30
end
2019-09-30 21:07:59 +05:30
# Set off a rebase asynchronously, atomically updating the `rebase_jid` of
# the MR so that the status of the operation can be tracked.
def rebase_async(user_id)
transaction do
lock!
raise ActiveRecord::StaleObjectError if !open? || rebase_in_progress?
# Although there is a race between setting rebase_jid here and clearing it
# in the RebaseWorker, it can't do any harm since we check both that the
# attribute is set *and* that the sidekiq job is still running. So a JID
# for a completed RebaseWorker is equivalent to a nil JID.
jid = Sidekiq::Worker.skipping_transaction_check do
RebaseWorker.perform_async(id, user_id)
end
update_column(:rebase_jid, jid)
end
2019-10-12 21:52:04 +05:30
# rebase_in_progress? depends on rebase_jid
# expire etag cache since the attribute is changed without triggering callbacks
expire_etag_cache
2019-09-30 21:07:59 +05:30
end
2018-11-08 19:23:39 +05:30
def merge_participants
participants = [author]
2019-09-04 21:01:54 +05:30
if auto_merge_enabled? && !participants.include?(merge_user)
2018-11-08 19:23:39 +05:30
participants << merge_user
end
participants
end
2015-10-24 18:46:33 +05:30
def first_commit
merge_request_diff ? merge_request_diff.first_commit : compare_commits.first
2015-11-26 14:37:03 +05:30
end
2015-10-24 18:46:33 +05:30
2016-09-13 17:45:13 +05:30
def raw_diffs(*args)
merge_request_diff ? merge_request_diff.raw_diffs(*args) : compare.raw_diffs(*args)
end
2017-08-17 22:00:37 +05:30
def diffs(diff_options = {})
2016-09-29 09:46:39 +05:30
if compare
2017-09-10 17:25:29 +05:30
# When saving MR diffs, `expanded` is implicitly added (because we need
2017-08-17 22:00:37 +05:30
# to save the entire contents to the DB), so add that here for
# consistency.
2017-09-10 17:25:29 +05:30
compare.diffs(diff_options.merge(expanded: true))
2016-09-13 17:45:13 +05:30
else
2016-09-29 09:46:39 +05:30
merge_request_diff.diffs(diff_options)
2016-09-13 17:45:13 +05:30
end
2016-08-24 12:49:21 +05:30
end
2018-11-08 19:23:39 +05:30
def non_latest_diffs
merge_request_diffs.where.not(id: merge_request_diff.id)
end
2019-02-15 15:39:39 +05:30
def preloads_discussion_diff_highlighting?
true
end
def preload_discussions_diff_highlight
preloadable_files = note_diff_files.for_commit_or_unresolved
discussions_diffs.load_highlight(preloadable_files.pluck(:id))
end
def discussions_diffs
strong_memoize(:discussions_diffs) do
Gitlab::DiscussionsDiff::FileCollection.new(note_diff_files.to_a)
end
end
def note_diff_files
NoteDiffFile
.where(diff_note: discussion_notes)
.includes(diff_note: :project)
end
2016-06-02 11:05:42 +05:30
def diff_size
2017-08-17 22:00:37 +05:30
# Calling `merge_request_diff.diffs.real_size` will also perform
# highlighting, which we don't need here.
2017-09-10 17:25:29 +05:30
merge_request_diff&.real_size || diffs.real_size
2016-06-02 11:05:42 +05:30
end
2018-12-13 13:39:08 +05:30
def modified_paths(past_merge_request_diff: nil)
diffs = if past_merge_request_diff
past_merge_request_diff
elsif compare
compare
else
self.merge_request_diff
end
diffs.modified_paths
end
2016-01-29 22:53:50 +05:30
def diff_base_commit
2016-08-24 12:49:21 +05:30
if persisted?
2016-01-29 22:53:50 +05:30
merge_request_diff.base_commit
2016-09-29 09:46:39 +05:30
else
branch_merge_base_commit
2016-01-29 22:53:50 +05:30
end
end
2016-08-24 12:49:21 +05:30
def diff_start_commit
if persisted?
merge_request_diff.start_commit
else
target_branch_head
end
end
def diff_head_commit
if persisted?
merge_request_diff.head_commit
else
source_branch_head
end
end
def diff_start_sha
2018-03-27 19:54:05 +05:30
if persisted?
merge_request_diff.start_commit_sha
else
target_branch_head.try(:sha)
end
2016-08-24 12:49:21 +05:30
end
def diff_base_sha
2018-03-27 19:54:05 +05:30
if persisted?
merge_request_diff.base_commit_sha
else
branch_merge_base_commit.try(:sha)
end
2016-08-24 12:49:21 +05:30
end
def diff_head_sha
2018-03-27 19:54:05 +05:30
if persisted?
merge_request_diff.head_commit_sha
else
source_branch_head.try(:sha)
end
2016-08-24 12:49:21 +05:30
end
# When importing a pull request from GitHub, the old and new branches may no
# longer actually exist by those names, but we need to recreate the merge
# request diff with the right source and target shas.
# We use these attributes to force these to the intended values.
attr_writer :target_branch_sha, :source_branch_sha
2018-03-17 18:26:18 +05:30
def source_branch_ref
return @source_branch_sha if @source_branch_sha
return unless source_branch
2017-08-17 22:00:37 +05:30
2018-03-17 18:26:18 +05:30
Gitlab::Git::BRANCH_REF_PREFIX + source_branch
end
def target_branch_ref
return @target_branch_sha if @target_branch_sha
return unless target_branch
Gitlab::Git::BRANCH_REF_PREFIX + target_branch
end
def source_branch_head
strong_memoize(:source_branch_head) do
if source_project && source_branch_ref
source_project.repository.commit(source_branch_ref)
end
end
2016-08-24 12:49:21 +05:30
end
def target_branch_head
2018-03-17 18:26:18 +05:30
strong_memoize(:target_branch_head) do
target_project.repository.commit(target_branch_ref)
end
2016-09-29 09:46:39 +05:30
end
def branch_merge_base_commit
start_sha = target_branch_sha
head_sha = source_branch_sha
if start_sha && head_sha
target_project.merge_base_commit(start_sha, head_sha)
end
2016-08-24 12:49:21 +05:30
end
def target_branch_sha
@target_branch_sha || target_branch_head.try(:sha)
end
def source_branch_sha
@source_branch_sha || source_branch_head.try(:sha)
end
def diff_refs
2019-09-30 21:07:59 +05:30
if importing? || persisted?
merge_request_diff.diff_refs
else
repository_diff_refs
end
2019-02-15 15:39:39 +05:30
end
# Instead trying to fetch the
# persisted diff_refs, this method goes
# straight to the repository to get the
# most recent data possible.
def repository_diff_refs
Gitlab::Diff::DiffRefs.new(
base_sha: branch_merge_base_sha,
start_sha: target_branch_sha,
head_sha: source_branch_sha
)
2016-09-13 17:45:13 +05:30
end
2016-09-29 09:46:39 +05:30
def branch_merge_base_sha
branch_merge_base_commit.try(:sha)
end
2014-09-02 18:07:02 +05:30
def validate_branches
2019-09-04 21:01:54 +05:30
return unless target_project && source_project
2014-09-02 18:07:02 +05:30
if target_project == source_project && target_branch == source_branch
2019-02-15 15:39:39 +05:30
errors.add :branch_conflict, "You can't use same project/branch for source and target"
return
2014-09-02 18:07:02 +05:30
end
2019-06-05 12:25:43 +05:30
[:source_branch, :target_branch].each { |attr| validate_branch_name(attr) }
2017-09-10 17:25:29 +05:30
if opened?
2019-02-15 15:39:39 +05:30
similar_mrs = target_project
.merge_requests
.where(source_branch: source_branch, target_branch: target_branch)
.where(source_project_id: source_project&.id)
.opened
similar_mrs = similar_mrs.where.not(id: id) if persisted?
conflict = similar_mrs.first
if conflict.present?
errors.add(
:validate_branches,
"Another open merge request already exists for this source branch: #{conflict.to_reference}"
)
2014-09-02 18:07:02 +05:30
end
end
end
2019-06-05 12:25:43 +05:30
def validate_branch_name(attr)
return unless changes_include?(attr)
branch = read_attribute(attr)
return unless branch
errors.add(attr) unless Gitlab::GitRefValidator.validate_merge_request_branch(branch)
end
2017-08-17 22:00:37 +05:30
def validate_target_project
return true if target_project.merge_requests_enabled?
errors.add :base, 'Target project has disabled merge requests'
end
2014-09-02 18:07:02 +05:30
def validate_fork
return true unless target_project && source_project
2016-09-29 09:46:39 +05:30
return true if target_project == source_project
2016-11-03 12:29:30 +05:30
return true unless source_project_missing?
2014-09-02 18:07:02 +05:30
2016-09-29 09:46:39 +05:30
errors.add :validate_fork,
'Source project is not a fork of the target project'
2014-09-02 18:07:02 +05:30
end
2017-09-10 17:25:29 +05:30
def merge_ongoing?
2018-03-17 18:26:18 +05:30
# While the MergeRequest is locked, it should present itself as 'merge ongoing'.
# The unlocking process is handled by StuckMergeJobsWorker scheduled in Cron.
return true if locked?
2017-09-10 17:25:29 +05:30
2018-03-17 18:26:18 +05:30
!!merge_jid && !merged? && Gitlab::SidekiqStatus.running?(merge_jid)
2017-09-10 17:25:29 +05:30
end
2016-09-29 09:46:39 +05:30
def closed_without_fork?
2016-11-03 12:29:30 +05:30
closed? && source_project_missing?
2016-09-29 09:46:39 +05:30
end
2016-11-03 12:29:30 +05:30
def source_project_missing?
2016-09-29 09:46:39 +05:30
return false unless for_fork?
return true unless source_project
2018-03-17 18:26:18 +05:30
!source_project.in_fork_network_of?(target_project)
2016-09-29 09:46:39 +05:30
end
def reopenable?
2016-11-03 12:29:30 +05:30
closed? && !source_project_missing? && source_branch_exists?
2016-09-29 09:46:39 +05:30
end
def ensure_merge_request_diff
merge_request_diff || create_merge_request_diff
end
def create_merge_request_diff
2018-03-17 18:26:18 +05:30
fetch_ref!
# n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37435
Gitlab::GitalyClient.allow_n_plus_1_calls do
2019-09-04 21:01:54 +05:30
merge_request_diffs.create!
2018-03-17 18:26:18 +05:30
reload_merge_request_diff
end
2016-09-29 09:46:39 +05:30
end
2018-05-09 12:01:36 +05:30
def viewable_diffs
@viewable_diffs ||= merge_request_diffs.viewable.to_a
end
2017-08-17 22:00:37 +05:30
def merge_request_diff_for(diff_refs_or_sha)
2018-05-09 12:01:36 +05:30
matcher =
if diff_refs_or_sha.is_a?(Gitlab::Diff::DiffRefs)
{
'start_commit_sha' => diff_refs_or_sha.start_sha,
'head_commit_sha' => diff_refs_or_sha.head_sha,
'base_commit_sha' => diff_refs_or_sha.base_sha
}
else
{ 'head_commit_sha' => diff_refs_or_sha }
end
2017-08-17 22:00:37 +05:30
2018-05-09 12:01:36 +05:30
viewable_diffs.find do |diff|
diff.attributes.slice(*matcher.keys) == matcher
end
2017-08-17 22:00:37 +05:30
end
2017-09-10 17:25:29 +05:30
def version_params_for(diff_refs)
if diff = merge_request_diff_for(diff_refs)
{ diff_id: diff.id }
elsif diff = merge_request_diff_for(diff_refs.head_sha)
{
diff_id: diff.id,
start_sha: diff_refs.start_sha
}
end
end
2018-03-17 18:26:18 +05:30
def clear_memoized_shas
@target_branch_sha = @source_branch_sha = nil
clear_memoization(:source_branch_head)
clear_memoization(:target_branch_head)
end
2016-09-29 09:46:39 +05:30
def reload_diff_if_branch_changed
2019-07-31 22:56:46 +05:30
if (saved_change_to_source_branch? || saved_change_to_target_branch?) &&
2018-03-17 18:26:18 +05:30
(source_branch_head && target_branch_head)
2016-08-24 12:49:21 +05:30
reload_diff
2014-09-02 18:07:02 +05:30
end
end
2018-12-05 23:21:45 +05:30
# rubocop: disable CodeReuse/ServiceClass
2017-09-10 17:25:29 +05:30
def reload_diff(current_user = nil)
2016-09-29 09:46:39 +05:30
return unless open?
2016-08-24 12:49:21 +05:30
2018-11-08 19:23:39 +05:30
MergeRequests::ReloadDiffsService.new(self, current_user).execute
2014-09-02 18:07:02 +05:30
end
2019-09-30 21:07:59 +05:30
def check_mergeability
MergeRequests::MergeabilityCheckService.new(self).execute(retry_lease: false)
end
# rubocop: enable CodeReuse/ServiceClass
2015-09-25 12:07:36 +05:30
2019-09-30 21:07:59 +05:30
# Returns boolean indicating the merge_status should be rechecked in order to
# switch to either can_be_merged or cannot_be_merged.
def recheck_merge_status?
self.class.state_machines[:merge_status].check_state?(merge_status)
2014-09-02 18:07:02 +05:30
end
def merge_event
2016-08-24 12:49:21 +05:30
@merge_event ||= target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::MERGED).last
2014-09-02 18:07:02 +05:30
end
def closed_event
2016-08-24 12:49:21 +05:30
@closed_event ||= target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::CLOSED).last
2014-09-02 18:07:02 +05:30
end
2015-09-11 14:41:01 +05:30
def work_in_progress?
2016-11-03 12:29:30 +05:30
self.class.work_in_progress?(title)
2016-06-02 11:05:42 +05:30
end
def wipless_title
2016-11-03 12:29:30 +05:30
self.class.wipless_title(self.title)
end
def wip_title
self.class.wip_title(self.title)
2015-09-11 14:41:01 +05:30
end
2016-08-24 12:49:21 +05:30
def mergeable?(skip_ci_check: false)
return false unless mergeable_state?(skip_ci_check: skip_ci_check)
2019-09-30 21:07:59 +05:30
check_mergeability
2018-03-17 18:26:18 +05:30
can_be_merged? && !should_be_rebased?
2015-09-11 14:41:01 +05:30
end
2018-03-17 18:26:18 +05:30
def mergeable_state?(skip_ci_check: false, skip_discussions_check: false)
return false unless open?
return false if work_in_progress?
return false if broken?
2016-08-24 12:49:21 +05:30
return false unless skip_ci_check || mergeable_ci_state?
2018-03-17 18:26:18 +05:30
return false unless skip_discussions_check || mergeable_discussions_state?
true
2015-09-11 14:41:01 +05:30
end
2018-03-17 18:26:18 +05:30
def ff_merge_possible?
project.repository.ancestor?(target_branch_sha, diff_head_sha)
end
def should_be_rebased?
project.ff_merge_must_be_possible? && !ff_merge_possible?
end
2019-09-04 21:01:54 +05:30
def can_cancel_auto_merge?(current_user)
2015-12-23 02:04:40 +05:30
can_be_merged_by?(current_user) || self.author == current_user
end
def can_remove_source_branch?(current_user)
2017-08-17 22:00:37 +05:30
!ProtectedBranch.protected?(source_project, source_branch) &&
2015-12-23 02:04:40 +05:30
!source_project.root_ref?(source_branch) &&
2016-09-29 09:46:39 +05:30
Ability.allowed?(current_user, :push_code, source_project) &&
2018-03-27 19:54:05 +05:30
diff_head_sha == source_branch_head.try(:sha)
2015-12-23 02:04:40 +05:30
end
2016-06-02 11:05:42 +05:30
def should_remove_source_branch?
2016-11-24 13:41:30 +05:30
Gitlab::Utils.to_boolean(merge_params['should_remove_source_branch'])
2016-06-02 11:05:42 +05:30
end
def force_remove_source_branch?
2016-11-24 13:41:30 +05:30
Gitlab::Utils.to_boolean(merge_params['force_remove_source_branch'])
2016-06-02 11:05:42 +05:30
end
2019-09-04 21:01:54 +05:30
def auto_merge_strategy
return unless auto_merge_enabled?
merge_params['auto_merge_strategy'] || AutoMergeService::STRATEGY_MERGE_WHEN_PIPELINE_SUCCEEDS
end
def auto_merge_strategy=(strategy)
merge_params['auto_merge_strategy'] = strategy
end
2016-06-02 11:05:42 +05:30
def remove_source_branch?
should_remove_source_branch? || force_remove_source_branch?
end
2018-11-08 19:23:39 +05:30
def notify_conflict?
(opened? || locked?) &&
has_commits? &&
!branch_missing? &&
!project.repository.can_be_merged?(diff_head_sha, target_branch)
rescue Gitlab::Git::CommandError
# Checking mergeability can trigger exception, e.g. non-utf8
# We ignore this type of errors.
false
end
2017-01-15 13:20:01 +05:30
def related_notes
2018-03-17 18:26:18 +05:30
# We're using a UNION ALL here since this results in better performance
# compared to using OR statements. We're using UNION ALL since the queries
# used won't produce any duplicates (e.g. a note for a commit can't also be
# a note for an MR).
2018-12-05 23:21:45 +05:30
Note
.from_union([notes, commit_notes], remove_duplicates: false)
2018-03-17 18:26:18 +05:30
.includes(:noteable)
2014-09-02 18:07:02 +05:30
end
2017-08-17 22:00:37 +05:30
alias_method :discussion_notes, :related_notes
2016-09-13 17:45:13 +05:30
2019-07-07 11:18:12 +05:30
def commit_notes
# Fetch comments only from last 100 commits
commit_ids = commit_shas.take(100)
Note
.user
.where(project_id: [source_project_id, target_project_id])
.for_commit_id(commit_ids)
end
2017-08-17 22:00:37 +05:30
def mergeable_discussions_state?
return true unless project.only_allow_merge_if_all_discussions_are_resolved?
2016-09-13 17:45:13 +05:30
2017-08-17 22:00:37 +05:30
!discussions_to_be_resolved?
2016-09-13 17:45:13 +05:30
end
2014-09-02 18:07:02 +05:30
def for_fork?
target_project != source_project
end
2016-09-29 09:46:39 +05:30
# If the merge request closes any issues, save this information in the
# `MergeRequestsClosingIssues` model. This is a performance optimization.
# Calculating this information for a number of merge requests requires
# running `ReferenceExtractor` on each of them separately.
2016-11-03 12:29:30 +05:30
# This optimization does not apply to issues from external sources.
2018-11-18 11:00:15 +05:30
def cache_merge_request_closes_issues!(current_user = self.author)
2017-09-10 17:25:29 +05:30
return unless project.issues_enabled?
2018-11-18 11:00:15 +05:30
return if closed? || merged?
2016-11-03 12:29:30 +05:30
2016-09-29 09:46:39 +05:30
transaction do
self.merge_requests_closing_issues.delete_all
2016-11-03 12:29:30 +05:30
2016-09-29 09:46:39 +05:30
closes_issues(current_user).each do |issue|
2017-09-10 17:25:29 +05:30
next if issue.is_a?(ExternalIssue)
2016-09-29 09:46:39 +05:30
self.merge_requests_closing_issues.create!(issue: issue)
end
end
end
2018-11-18 11:00:15 +05:30
def visible_closing_issues_for(current_user = self.author)
strong_memoize(:visible_closing_issues_for) do
if self.target_project.has_external_issue_tracker?
closes_issues(current_user)
else
cached_closes_issues.select do |issue|
Ability.allowed?(current_user, :read_issue, issue)
end
end
end
end
2014-09-02 18:07:02 +05:30
# Return the set of issues that will be closed if this merge request is accepted.
2015-04-26 12:48:37 +05:30
def closes_issues(current_user = self.author)
2014-09-02 18:07:02 +05:30
if target_branch == project.default_branch
2017-08-17 22:00:37 +05:30
messages = [title, description]
2016-09-29 09:46:39 +05:30
messages.concat(commits.map(&:safe_message)) if merge_request_diff
2016-04-02 18:10:28 +05:30
2017-09-10 17:25:29 +05:30
Gitlab::ClosingIssueExtractor.new(project, current_user)
.closed_by_message(messages.join("\n"))
2014-09-02 18:07:02 +05:30
else
[]
end
end
2017-08-17 22:00:37 +05:30
def issues_mentioned_but_not_closing(current_user)
return [] unless target_branch == project.default_branch
ext = Gitlab::ReferenceExtractor.new(project, current_user)
ext.analyze("#{title}\n#{description}")
2018-11-18 11:00:15 +05:30
ext.issues - visible_closing_issues_for(current_user)
2017-08-17 22:00:37 +05:30
end
2014-09-02 18:07:02 +05:30
def target_project_path
if target_project
2017-09-10 17:25:29 +05:30
target_project.full_path
2014-09-02 18:07:02 +05:30
else
"(removed)"
end
end
def source_project_path
if source_project
2017-09-10 17:25:29 +05:30
source_project.full_path
2014-09-02 18:07:02 +05:30
else
"(removed)"
end
end
def source_project_namespace
if source_project && source_project.namespace
2017-08-17 22:00:37 +05:30
source_project.namespace.full_path
2014-09-02 18:07:02 +05:30
else
"(removed)"
end
end
def target_project_namespace
if target_project && target_project.namespace
2017-08-17 22:00:37 +05:30
target_project.namespace.full_path
2014-09-02 18:07:02 +05:30
else
"(removed)"
end
end
def source_branch_exists?
return false unless self.source_project
2018-03-17 18:26:18 +05:30
self.source_project.repository.branch_exists?(self.source_branch)
2014-09-02 18:07:02 +05:30
end
def target_branch_exists?
return false unless self.target_project
2018-03-17 18:26:18 +05:30
self.target_project.repository.branch_exists?(self.target_branch)
2014-09-02 18:07:02 +05:30
end
2019-03-02 22:35:43 +05:30
def default_merge_commit_message(include_description: false)
2018-11-18 11:00:15 +05:30
closes_issues_references = visible_closing_issues_for.map do |issue|
2017-08-17 22:00:37 +05:30
issue.to_reference(target_project)
end
message = [
"Merge branch '#{source_branch}' into '#{target_branch}'",
title
]
if !include_description && closes_issues_references.present?
message << "Closes #{closes_issues_references.to_sentence}"
end
message << "#{description}" if include_description && description.present?
2018-03-17 18:26:18 +05:30
message << "See merge request #{to_reference(full: true)}"
2016-11-03 12:29:30 +05:30
2017-08-17 22:00:37 +05:30
message.join("\n\n")
2014-09-02 18:07:02 +05:30
end
2019-03-02 22:35:43 +05:30
# Returns the oldest multi-line commit message, or the MR title if none found
def default_squash_commit_message
strong_memoize(:default_squash_commit_message) do
commits.without_merge_commits.reverse.find(&:description?)&.safe_message || title
end
end
2014-09-02 18:07:02 +05:30
# Return array of possible target branches
2015-04-26 12:48:37 +05:30
# depends on target project of MR
2014-09-02 18:07:02 +05:30
def target_branches
if target_project.nil?
[]
else
target_project.repository.branch_names
end
end
# Return array of possible source branches
2015-04-26 12:48:37 +05:30
# depends on source project of MR
2014-09-02 18:07:02 +05:30
def source_branches
if source_project.nil?
[]
else
source_project.repository.branch_names
end
end
2015-04-26 12:48:37 +05:30
2015-09-11 14:41:01 +05:30
def has_ci?
2018-03-17 18:26:18 +05:30
return false if has_no_commits?
2017-08-17 22:00:37 +05:30
2018-03-17 18:26:18 +05:30
!!(head_pipeline_id || all_pipelines.any? || source_project&.ci_service)
2015-09-11 14:41:01 +05:30
end
def branch_missing?
!source_branch_exists? || !target_branch_exists?
end
def broken?
2017-08-17 22:00:37 +05:30
has_no_commits? || branch_missing? || cannot_be_merged?
end
2015-09-11 14:41:01 +05:30
def can_be_merged_by?(user)
2016-08-24 12:49:21 +05:30
access = ::Gitlab::UserAccess.new(user, project: project)
2018-03-27 19:54:05 +05:30
access.can_update_branch?(target_branch)
2016-08-24 12:49:21 +05:30
end
def can_be_merged_via_command_line_by?(user)
access = ::Gitlab::UserAccess.new(user, project: project)
access.can_push_to_branch?(target_branch)
2015-09-11 14:41:01 +05:30
end
def mergeable_ci_state?
2017-08-17 22:00:37 +05:30
return true unless project.only_allow_merge_if_pipeline_succeeds?
2019-09-30 21:07:59 +05:30
return false unless actual_head_pipeline
2019-09-30 21:07:59 +05:30
actual_head_pipeline.success? || actual_head_pipeline.skipped?
end
2017-08-17 22:00:37 +05:30
def environments_for(current_user)
2016-09-29 09:46:39 +05:30
return [] unless diff_head_commit
2016-09-13 17:45:13 +05:30
2017-08-17 22:00:37 +05:30
@environments ||= Hash.new do |h, current_user|
envs = EnvironmentsFinder.new(target_project, current_user,
ref: target_branch, commit: diff_head_commit, with_tags: true).execute
if source_project
envs.concat EnvironmentsFinder.new(source_project, current_user,
ref: source_branch, commit: diff_head_commit).execute
2016-11-03 12:29:30 +05:30
end
2017-08-17 22:00:37 +05:30
h[current_user] = envs.uniq
end
@environments[current_user]
2016-09-13 17:45:13 +05:30
end
2019-07-07 11:18:12 +05:30
##
# This method is for looking for active environments which created via pipelines for merge requests.
# Since deployments run on a merge request ref (e.g. `refs/merge-requests/:iid/head`),
# we cannot look up environments with source branch name.
def environments
return Environment.none unless actual_head_pipeline&.triggered_by_merge_request?
actual_head_pipeline.environments
end
2015-09-11 14:41:01 +05:30
def state_human_name
if merged?
"Merged"
elsif closed?
"Closed"
else
"Open"
end
end
2015-09-25 12:07:36 +05:30
2016-06-02 11:05:42 +05:30
def state_icon_name
if merged?
2018-03-17 18:26:18 +05:30
"git-merge"
2016-06-02 11:05:42 +05:30
elsif closed?
2018-03-17 18:26:18 +05:30
"close"
2016-06-02 11:05:42 +05:30
else
2018-03-17 18:26:18 +05:30
"issue-open-m"
2016-06-02 11:05:42 +05:30
end
end
2018-03-17 18:26:18 +05:30
def fetch_ref!
target_project.repository.fetch_source_branch!(source_project.repository, source_branch, ref_path)
2015-09-25 12:07:36 +05:30
end
2019-09-30 21:07:59 +05:30
# Returns the current merge-ref HEAD commit.
#
def merge_ref_head
project.repository.commit(merge_ref_path)
end
2015-09-25 12:07:36 +05:30
def ref_path
2018-03-17 18:26:18 +05:30
"refs/#{Repository::REF_MERGE_REQUEST}/#{iid}/head"
2015-09-25 12:07:36 +05:30
end
2019-07-07 11:18:12 +05:30
def merge_ref_path
"refs/#{Repository::REF_MERGE_REQUEST}/#{iid}/merge"
end
2019-09-30 21:07:59 +05:30
def train_ref_path
"refs/#{Repository::REF_MERGE_REQUEST}/#{iid}/train"
end
def cleanup_refs(only: :all)
target_refs = []
target_refs << ref_path if %i[all head].include?(only)
target_refs << merge_ref_path if %i[all merge].include?(only)
target_refs << train_ref_path if %i[all train].include?(only)
project.repository.delete_refs(*target_refs)
end
2019-07-07 11:18:12 +05:30
def self.merge_request_ref?(ref)
ref.start_with?("refs/#{Repository::REF_MERGE_REQUEST}/")
end
2015-09-25 12:07:36 +05:30
def in_locked_state
begin
lock_mr
yield
ensure
2018-03-17 18:26:18 +05:30
unlock_mr
2015-09-25 12:07:36 +05:30
end
end
2015-11-26 14:37:03 +05:30
2016-06-02 11:05:42 +05:30
def diverged_commits_count
cache = Rails.cache.read(:"merge_request_#{id}_diverged_commits")
2016-08-24 12:49:21 +05:30
if cache.blank? || cache[:source_sha] != source_branch_sha || cache[:target_sha] != target_branch_sha
2016-06-02 11:05:42 +05:30
cache = {
2016-08-24 12:49:21 +05:30
source_sha: source_branch_sha,
target_sha: target_branch_sha,
2016-06-02 11:05:42 +05:30
diverged_commits_count: compute_diverged_commits_count
}
Rails.cache.write(:"merge_request_#{id}_diverged_commits", cache)
end
cache[:diverged_commits_count]
end
def compute_diverged_commits_count
2016-08-24 12:49:21 +05:30
return 0 unless source_branch_sha && target_branch_sha
2016-06-02 11:05:42 +05:30
2018-03-17 18:26:18 +05:30
target_project.repository
.count_commits_between(source_branch_sha, target_branch_sha)
2016-06-02 11:05:42 +05:30
end
private :compute_diverged_commits_count
def diverged_from_target_branch?
diverged_commits_count > 0
end
2019-07-07 11:18:12 +05:30
def all_pipelines
2017-08-17 22:00:37 +05:30
return Ci::Pipeline.none unless source_project
2016-09-29 09:46:39 +05:30
2019-07-07 11:18:12 +05:30
shas = all_commit_shas
strong_memoize(:all_pipelines) do
Ci::Pipeline.from_union(
[source_project.ci_pipelines.merge_request_pipelines(self, shas),
source_project.ci_pipelines.detached_merge_request_pipelines(self, shas),
source_project.ci_pipelines.triggered_for_branch(source_branch).for_sha(shas)],
remove_duplicates: false).sort_by_merge_request_pipelines
end
2019-02-15 15:39:39 +05:30
end
def update_head_pipeline
find_actual_head_pipeline.try do |pipeline|
self.head_pipeline = pipeline
update_column(:head_pipeline_id, head_pipeline.id) if head_pipeline_id_changed?
end
end
2018-11-18 11:00:15 +05:30
def has_test_reports?
2019-07-07 11:18:12 +05:30
actual_head_pipeline&.has_reports?(Ci::JobArtifact.test_reports)
2018-11-18 11:00:15 +05:30
end
2019-02-15 15:39:39 +05:30
def predefined_variables
Gitlab::Ci::Variables::Collection.new.tap do |variables|
variables.append(key: 'CI_MERGE_REQUEST_ID', value: id.to_s)
variables.append(key: 'CI_MERGE_REQUEST_IID', value: iid.to_s)
2019-07-07 11:18:12 +05:30
variables.append(key: 'CI_MERGE_REQUEST_REF_PATH', value: ref_path.to_s)
variables.append(key: 'CI_MERGE_REQUEST_PROJECT_ID', value: project.id.to_s)
variables.append(key: 'CI_MERGE_REQUEST_PROJECT_PATH', value: project.full_path)
variables.append(key: 'CI_MERGE_REQUEST_PROJECT_URL', value: project.web_url)
variables.append(key: 'CI_MERGE_REQUEST_TARGET_BRANCH_NAME', value: target_branch.to_s)
variables.append(key: 'CI_MERGE_REQUEST_TITLE', value: title)
2019-07-31 22:56:46 +05:30
variables.append(key: 'CI_MERGE_REQUEST_ASSIGNEES', value: assignee_username_list) if assignees.any?
2019-07-07 11:18:12 +05:30
variables.append(key: 'CI_MERGE_REQUEST_MILESTONE', value: milestone.title) if milestone
variables.append(key: 'CI_MERGE_REQUEST_LABELS', value: label_names.join(',')) if labels.present?
variables.concat(source_project_variables)
2019-02-15 15:39:39 +05:30
end
end
2018-11-18 11:00:15 +05:30
def compare_test_reports
unless has_test_reports?
return { status: :error, status_reason: 'This merge request does not have test reports' }
end
2019-02-15 15:39:39 +05:30
compare_reports(Ci::CompareTestReportsService)
end
def compare_reports(service_class)
with_reactive_cache(service_class.name) do |data|
unless service_class.new(project)
2018-11-18 11:00:15 +05:30
.latest?(base_pipeline, actual_head_pipeline, data)
raise InvalidateReactiveCache
end
data
end || { status: :parsing }
end
def calculate_reactive_cache(identifier, *args)
2019-02-15 15:39:39 +05:30
service_class = identifier.constantize
raise NameError, service_class unless service_class < Ci::CompareReportsBaseService
service_class.new(project).execute(base_pipeline, actual_head_pipeline)
2018-11-18 11:00:15 +05:30
end
2018-03-17 18:26:18 +05:30
def all_commits
MergeRequestDiffCommit
2019-10-12 21:52:04 +05:30
.where(merge_request_diff: merge_request_diffs.recent)
2018-03-17 18:26:18 +05:30
.limit(10_000)
end
2016-09-29 09:46:39 +05:30
# Note that this could also return SHA from now dangling commits
2016-11-03 12:29:30 +05:30
#
2017-09-10 17:25:29 +05:30
def all_commit_shas
2018-03-17 18:26:18 +05:30
@all_commit_shas ||= begin
return commit_shas unless persisted?
2017-09-10 17:25:29 +05:30
2018-03-17 18:26:18 +05:30
all_commits.pluck(:sha).uniq
2016-11-03 12:29:30 +05:30
end
2016-09-13 17:45:13 +05:30
end
2016-04-02 18:10:28 +05:30
def merge_commit
@merge_commit ||= project.commit(merge_commit_sha) if merge_commit_sha
end
2018-10-15 14:42:47 +05:30
def short_merge_commit_sha
Commit.truncate_sha(merge_commit_sha) if merge_commit_sha
end
2017-01-15 13:20:01 +05:30
def can_be_reverted?(current_user)
2018-03-17 18:26:18 +05:30
return false unless merge_commit
2018-11-18 11:00:15 +05:30
return false unless merged_at
2018-03-17 18:26:18 +05:30
2018-11-18 11:00:15 +05:30
# It is not guaranteed that Note#created_at will be strictly later than
# MergeRequestMetric#merged_at. Nanoseconds on MySQL may break this
# comparison, as will a HA environment if clocks are not *precisely*
# synchronized. Add a minute's leeway to compensate for both possibilities
cutoff = merged_at - 1.minute
2018-03-17 18:26:18 +05:30
2018-11-18 11:00:15 +05:30
notes_association = notes_with_associations.where('created_at >= ?', cutoff)
2018-03-17 18:26:18 +05:30
!merge_commit.has_been_reverted?(current_user, notes_association)
2016-04-02 18:10:28 +05:30
end
2016-06-02 11:05:42 +05:30
2018-11-18 11:00:15 +05:30
def merged_at
strong_memoize(:merged_at) do
next unless merged?
metrics&.merged_at ||
merge_event&.created_at ||
notes.system.reorder(nil).find_by(note: 'merged')&.created_at
end
end
2016-06-02 11:05:42 +05:30
def can_be_cherry_picked?
2017-08-17 22:00:37 +05:30
merge_commit.present?
2016-06-02 11:05:42 +05:30
end
2016-08-24 12:49:21 +05:30
2016-09-13 17:45:13 +05:30
def has_complete_diff_refs?
2017-09-10 17:25:29 +05:30
diff_refs && diff_refs.complete?
2016-08-24 12:49:21 +05:30
end
2018-12-05 23:21:45 +05:30
# rubocop: disable CodeReuse/ServiceClass
2017-09-10 17:25:29 +05:30
def update_diff_discussion_positions(old_diff_refs:, new_diff_refs:, current_user: nil)
2016-09-13 17:45:13 +05:30
return unless has_complete_diff_refs?
2016-08-24 12:49:21 +05:30
return if new_diff_refs == old_diff_refs
2017-09-10 17:25:29 +05:30
active_diff_discussions = self.notes.new_diff_notes.discussions.select do |discussion|
discussion.active?(old_diff_refs)
2016-08-24 12:49:21 +05:30
end
2017-09-10 17:25:29 +05:30
return if active_diff_discussions.empty?
2016-08-24 12:49:21 +05:30
2017-09-10 17:25:29 +05:30
paths = active_diff_discussions.flat_map { |n| n.diff_file.paths }.uniq
2016-08-24 12:49:21 +05:30
2017-09-10 17:25:29 +05:30
service = Discussions::UpdateDiffPositionService.new(
2016-08-24 12:49:21 +05:30
self.project,
2017-09-10 17:25:29 +05:30
current_user,
2016-08-24 12:49:21 +05:30
old_diff_refs: old_diff_refs,
new_diff_refs: new_diff_refs,
paths: paths
)
2017-09-10 17:25:29 +05:30
active_diff_discussions.each do |discussion|
service.execute(discussion)
2016-08-24 12:49:21 +05:30
end
2018-03-17 18:26:18 +05:30
if project.resolve_outdated_diff_discussions?
MergeRequests::ResolvedDiscussionNotificationService
.new(project, current_user)
.execute(self)
end
2016-08-24 12:49:21 +05:30
end
2018-12-05 23:21:45 +05:30
# rubocop: enable CodeReuse/ServiceClass
2016-08-24 12:49:21 +05:30
def keep_around_commit
project.repository.keep_around(self.merge_commit_sha)
end
2016-09-13 17:45:13 +05:30
2017-08-17 22:00:37 +05:30
def has_commits?
2019-07-07 11:18:12 +05:30
merge_request_diff && commits_count.to_i > 0
2016-09-13 17:45:13 +05:30
end
2017-08-17 22:00:37 +05:30
def has_no_commits?
!has_commits?
2016-09-13 17:45:13 +05:30
end
2017-09-10 17:25:29 +05:30
def mergeable_with_quick_action?(current_user, autocomplete_precheck: false, last_diff_sha: nil)
2017-08-17 22:00:37 +05:30
return false unless can_be_merged_by?(current_user)
2016-09-13 17:45:13 +05:30
2017-08-17 22:00:37 +05:30
return true if autocomplete_precheck
2016-09-13 17:45:13 +05:30
2017-08-17 22:00:37 +05:30
return false unless mergeable?(skip_ci_check: true)
2018-03-17 18:26:18 +05:30
return false if actual_head_pipeline && !(actual_head_pipeline.success? || actual_head_pipeline.active?)
2017-08-17 22:00:37 +05:30
return false if last_diff_sha != diff_head_sha
true
2016-09-13 17:45:13 +05:30
end
2018-03-17 18:26:18 +05:30
2018-11-18 11:00:15 +05:30
def base_pipeline
2019-02-15 15:39:39 +05:30
@base_pipeline ||= project.ci_pipelines
2018-11-18 11:00:15 +05:30
.order(id: :desc)
2019-07-07 11:18:12 +05:30
.find_by(sha: diff_base_sha, ref: target_branch)
2018-11-18 11:00:15 +05:30
end
2018-11-08 19:23:39 +05:30
def discussions_rendered_on_frontend?
true
end
2018-12-05 23:21:45 +05:30
# rubocop: disable CodeReuse/ServiceClass
2018-03-17 18:26:18 +05:30
def update_project_counter_caches
Projects::OpenMergeRequestsCountService.new(target_project).refresh_cache
end
2018-12-05 23:21:45 +05:30
# rubocop: enable CodeReuse/ServiceClass
2018-03-17 18:26:18 +05:30
def first_contribution?
return false if project.team.max_member_access(author_id) > Gitlab::Access::GUEST
project.merge_requests.merged.where(author_id: author_id).empty?
end
2018-03-27 19:54:05 +05:30
2018-11-08 19:23:39 +05:30
# TODO: remove once production database rename completes
2019-09-30 21:07:59 +05:30
# https://gitlab.com/gitlab-org/gitlab-ce/issues/47592
2018-11-08 19:23:39 +05:30
alias_attribute :allow_collaboration, :allow_maintainer_to_push
def allow_collaboration
collaborative_push_possible? && allow_maintainer_to_push
2018-03-27 19:54:05 +05:30
end
2018-11-08 19:23:39 +05:30
alias_method :allow_collaboration?, :allow_collaboration
2018-03-27 19:54:05 +05:30
2018-11-08 19:23:39 +05:30
def collaborative_push_possible?
2018-03-27 19:54:05 +05:30
source_project.present? && for_fork? &&
target_project.visibility_level > Gitlab::VisibilityLevel::PRIVATE &&
source_project.visibility_level > Gitlab::VisibilityLevel::PRIVATE &&
!ProtectedBranch.protected?(source_project, source_branch)
end
2018-11-08 19:23:39 +05:30
def can_allow_collaboration?(user)
collaborative_push_possible? &&
2018-03-27 19:54:05 +05:30
Ability.allowed?(user, :push_code, source_project)
end
2018-11-08 19:23:39 +05:30
def squash_in_progress?
# The source project can be deleted
return false unless source_project
source_project.repository.squash_in_progress?(id)
end
2019-02-15 15:39:39 +05:30
def find_actual_head_pipeline
2019-07-07 11:18:12 +05:30
all_pipelines.for_sha_or_source_sha(diff_head_sha).first
end
2019-07-31 22:56:46 +05:30
private
2019-07-07 11:18:12 +05:30
def source_project_variables
Gitlab::Ci::Variables::Collection.new.tap do |variables|
break variables unless source_project
variables.append(key: 'CI_MERGE_REQUEST_SOURCE_PROJECT_ID', value: source_project.id.to_s)
variables.append(key: 'CI_MERGE_REQUEST_SOURCE_PROJECT_PATH', value: source_project.full_path)
variables.append(key: 'CI_MERGE_REQUEST_SOURCE_PROJECT_URL', value: source_project.web_url)
variables.append(key: 'CI_MERGE_REQUEST_SOURCE_BRANCH_NAME', value: source_branch.to_s)
end
2019-02-15 15:39:39 +05:30
end
2019-10-12 21:52:04 +05:30
def expire_etag_cache
return unless project.namespace
key = Gitlab::Routing.url_helpers.cached_widget_project_json_merge_request_path(project, self, format: :json)
Gitlab::EtagCaching::Store.new.touch(key)
end
2014-09-02 18:07:02 +05:30
end