merge_request.rb 25.8 KB
Newer Older
D
Dmitriy Zaporozhets 已提交
1
class MergeRequest < ActiveRecord::Base
2
  include InternalId
3
  include Issuable
4
  include Noteable
5
  include Referable
6
  include Sortable
7

8 9
  belongs_to :target_project, class_name: "Project"
  belongs_to :source_project, class_name: "Project"
Z
Zeger-Jan van de Weg 已提交
10
  belongs_to :merge_user, class_name: "User"
11

12
  has_many :merge_request_diffs, dependent: :destroy
13 14 15
  has_one :merge_request_diff,
    -> { order('merge_request_diffs.id DESC') }

16 17
  has_many :events, as: :target, dependent: :destroy

18
  has_many :merge_requests_closing_issues, class_name: 'MergeRequestsClosingIssues', dependent: :delete_all
19

20 21
  belongs_to :assignee, class_name: "User"

Z
Zeger-Jan van de Weg 已提交
22 23
  serialize :merge_params, Hash

24 25
  after_create :ensure_merge_request_diff, unless: :importing?
  after_update :reload_diff_if_branch_changed
26

27 28
  delegate :commits, :real_size, :commits_sha, :commits_count,
    to: :merge_request_diff, prefix: nil
I
Izaak Alpert 已提交
29

D
Dmitriy Zaporozhets 已提交
30 31 32 33
  # When this attribute is true some MR validation is ignored
  # It allows us to close or modify broken merge requests
  attr_accessor :allow_broken

D
Dmitriy Zaporozhets 已提交
34 35
  # Temporary fields to store compare vars
  # when creating new merge request
36
  attr_accessor :can_be_created, :compare_commits, :diff_options, :compare
D
Dmitriy Zaporozhets 已提交
37

A
Andrew8xx8 已提交
38
  state_machine :state, initial: :opened do
A
Andrew8xx8 已提交
39 40 41 42
    event :close do
      transition [:reopened, :opened] => :closed
    end

43
    event :mark_as_merged do
D
Dmitriy Zaporozhets 已提交
44
      transition [:reopened, :opened, :locked] => :merged
A
Andrew8xx8 已提交
45 46 47
    end

    event :reopen do
A
Andrew8xx8 已提交
48
      transition closed: :reopened
A
Andrew8xx8 已提交
49 50
    end

51
    event :lock_mr do
D
Dmitriy Zaporozhets 已提交
52 53 54
      transition [:reopened, :opened] => :locked
    end

55
    event :unlock_mr do
D
Dmitriy Zaporozhets 已提交
56 57 58
      transition locked: :reopened
    end

59 60 61 62 63
    after_transition any => :locked do |merge_request, transition|
      merge_request.locked_at = Time.now
      merge_request.save
    end

64
    after_transition locked: (any - :locked) do |merge_request, transition|
65 66 67 68
      merge_request.locked_at = nil
      merge_request.save
    end

A
Andrew8xx8 已提交
69 70 71 72
    state :opened
    state :reopened
    state :closed
    state :merged
D
Dmitriy Zaporozhets 已提交
73
    state :locked
A
Andrew8xx8 已提交
74 75
  end

76 77 78 79 80 81
  state_machine :merge_status, initial: :unchecked do
    event :mark_as_unchecked do
      transition [:can_be_merged, :cannot_be_merged] => :unchecked
    end

    event :mark_as_mergeable do
82
      transition [:unchecked, :cannot_be_merged] => :can_be_merged
83 84 85
    end

    event :mark_as_unmergeable do
86
      transition [:unchecked, :can_be_merged] => :cannot_be_merged
87 88
    end

89
    state :unchecked
90 91
    state :can_be_merged
    state :cannot_be_merged
92 93

    around_transition do |merge_request, transition, block|
94
      Gitlab::Timeless.timeless(merge_request, &block)
95
    end
96
  end
97

98
  validates :source_project, presence: true, unless: [:allow_broken, :importing?, :closed_without_fork?]
A
Andrey Kumanyaev 已提交
99
  validates :source_branch, presence: true
I
Izaak Alpert 已提交
100
  validates :target_project, presence: true
A
Andrey Kumanyaev 已提交
101
  validates :target_branch, presence: true
J
James Lopez 已提交
102
  validates :merge_user, presence: true, if: :merge_when_pipeline_succeeds?, unless: :importing?
103 104
  validate :validate_branches, unless: [:allow_broken, :importing?, :closed_without_fork?]
  validate :validate_fork, unless: :closed_without_fork?
105
  validate :validate_target_project, on: :create
D
Dmitriy Zaporozhets 已提交
106

107 108 109
  scope :by_source_or_target_branch, ->(branch_name) do
    where("source_branch = :branch OR target_branch = :branch", branch: branch_name)
  end
110
  scope :by_milestone, ->(milestone) { where(milestone_id: milestone) }
111
  scope :of_projects, ->(ids) { where(target_project_id: ids) }
112
  scope :from_project, ->(project) { where(source_project_id: project.id) }
113 114
  scope :merged, -> { with_state(:merged) }
  scope :closed_and_merged, -> { with_states(:closed, :merged) }
S
Scott Le 已提交
115
  scope :from_source_branches, ->(branches) { where(source_branch: branches) }
116

117 118
  scope :join_project, -> { joins(:target_project) }
  scope :references_project, -> { references(:target_project) }
119 120 121 122 123
  scope :assigned, -> { where("assignee_id IS NOT NULL") }
  scope :unassigned, -> { where("assignee_id IS NULL") }
  scope :assigned_to, ->(u) { where(assignee_id: u.id)}

  participant :assignee
124

125
  after_save :keep_around_commit
126
  after_save :update_assignee_cache_counts, if: :assignee_id_changed?
127

128 129 130 131
  def self.reference_prefix
    '!'
  end

132 133 134 135
  # Pattern used to extract `!123` merge request references from text
  #
  # This pattern supports cross-project references.
  def self.reference_pattern
136
    @reference_pattern ||= %r{
137
      (#{Project.reference_pattern})?
138 139 140 141
      #{Regexp.escape(reference_prefix)}(?<merge_request>\d+)
    }x
  end

142
  def self.link_reference_pattern
143
    @link_reference_pattern ||= super("merge_requests", /(?<merge_request>\d+)/)
144 145
  end

146 147 148 149
  def self.reference_valid?(reference)
    reference.to_i > 0 && reference.to_i <= Gitlab::Database::MAX_INT_VALUE
  end

150 151 152 153
  def self.project_foreign_key
    'target_project_id'
  end

154 155 156 157 158 159 160 161 162 163 164
  # 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)
M
mhasbini 已提交
165 166 167 168
    # unscoping unnecessary conditions that'll be applied
    # when executing `where("merge_requests.id IN (#{union.to_sql})")`
    source = unscoped.where(source_project_id: relation).select(:id)
    target = unscoped.where(target_project_id: relation).select(:id)
169 170 171 172 173
    union  = Gitlab::SQL::Union.new([source, target])

    where("merge_requests.id IN (#{union.to_sql})")
  end

T
Thomas Balthazar 已提交
174 175 176 177 178 179 180 181 182 183 184 185 186 187
  WIP_REGEX = /\A\s*(\[WIP\]\s*|WIP:\s*|WIP\s+)+\s*/i.freeze

  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

188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211
  def update_assignee_cache_counts
    # make sure we flush the cache for both the old *and* new assignees(if they exist)
    previous_assignee = User.find_by_id(assignee_id_was) if assignee_id_was
    previous_assignee&.update_cache_counts
    assignee&.update_cache_counts
  end

  # Returns a Hash of attributes to be used for Twitter card metadata
  def card_attributes
    {
      'Author'   => author.try(:name),
      'Assignee' => assignee.try(:name)
    }
  end

  # This method is needed for compatibility with issues to not mess view and other code
  def assignees
    Array(assignee)
  end

  def assignee_or_author?(user)
    author_id == user.id || assignee_id == user.id
  end

212
  # `from` argument can be a Namespace or Project.
213
  def to_reference(from = nil, full: false)
214 215
    reference = "#{self.class.reference_prefix}#{iid}"

216
    "#{project.to_reference(from, full: full)}#{reference}"
217 218
  end

219 220
  def first_commit
    merge_request_diff ? merge_request_diff.first_commit : compare_commits.first
221
  end
222

223
  def raw_diffs(*args)
224
    merge_request_diff ? merge_request_diff.raw_diffs(*args) : compare.raw_diffs(*args)
S
Sean McGivern 已提交
225 226
  end

227
  def diffs(diff_options = {})
228
    if compare
229 230 231 232
      # When saving MR diffs, `no_collapse` is implicitly added (because we need
      # to save the entire contents to the DB), so add that here for
      # consistency.
      compare.diffs(diff_options.merge(no_collapse: true))
233
    else
234
      merge_request_diff.diffs(diff_options)
235
    end
S
Sean McGivern 已提交
236 237
  end

J
Jacob Vosmaer 已提交
238
  def diff_size
239 240 241
    # Calling `merge_request_diff.diffs.real_size` will also perform
    # highlighting, which we don't need here.
    return real_size if merge_request_diff
242

243
    diffs.real_size
J
Jacob Vosmaer 已提交
244 245
  end

246
  def diff_base_commit
247
    if persisted?
248
      merge_request_diff.base_commit
249 250
    else
      branch_merge_base_commit
251 252 253 254 255 256 257 258 259
    end
  end

  # MRs created before 8.4 don't store a MergeRequestDiff#base_commit_sha,
  # but we need to get a commit for the "View file @ ..." link by deleted files,
  # so we find the likely one if we can't get the actual one.
  # This will not be the actual base commit if the target branch was merged into
  # the source branch after the merge request was created, but it is good enough
  # for the specific purpose of linking to a commit.
D
Douwe Maan 已提交
260 261 262
  # It is not good enough for use in `Gitlab::Git::DiffRefs`, which needs the
  # true base commit, so we can't simply have `#diff_base_commit` fall back on
  # this method.
263
  def likely_diff_base_commit
264
    first_commit.try(:parent) || first_commit
265 266 267 268 269 270 271
  end

  def diff_start_commit
    if persisted?
      merge_request_diff.start_commit
    else
      target_branch_head
272 273 274
    end
  end

275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302
  def diff_head_commit
    if persisted?
      merge_request_diff.head_commit
    else
      source_branch_head
    end
  end

  def diff_start_sha
    diff_start_commit.try(:sha)
  end

  def diff_base_sha
    diff_base_commit.try(:sha)
  end

  def diff_head_sha
    diff_head_commit.try(:sha)
  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

  def source_branch_head
    source_branch_ref = @source_branch_sha || source_branch
S
Sean McGivern 已提交
303
    source_project.repository.commit(source_branch_ref) if source_branch_ref
304 305 306 307
  end

  def target_branch_head
    target_branch_ref = @target_branch_sha || target_branch
S
Sean McGivern 已提交
308
    target_project.repository.commit(target_branch_ref) if target_branch_ref
309 310
  end

311 312 313 314 315 316 317 318 319
  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
  end

320
  def target_branch_sha
321
    @target_branch_sha || target_branch_head.try(:sha)
322 323 324
  end

  def source_branch_sha
325
    @source_branch_sha || source_branch_head.try(:sha)
326 327
  end

328 329 330 331 332 333 334 335
  def diff_refs
    return unless diff_start_commit || diff_base_commit

    Gitlab::Diff::DiffRefs.new(
      base_sha:  diff_base_sha,
      start_sha: diff_start_sha,
      head_sha:  diff_head_sha
    )
336 337
  end

338 339
  # Return diff_refs instance trying to not touch the git repository
  def diff_sha_refs
340
    if merge_request_diff && merge_request_diff.diff_refs_by_sha?
341
      merge_request_diff.diff_refs
342
    else
343
      diff_refs
344
    end
345 346
  end

347 348 349 350
  def branch_merge_base_sha
    branch_merge_base_commit.try(:sha)
  end

351
  def validate_branches
352
    if target_project == source_project && target_branch == source_branch
I
Izaak Alpert 已提交
353
      errors.add :branch_conflict, "You can not use same project/branch for source and target"
354
    end
355

356
    if opened? || reopened?
357
      similar_mrs = self.target_project.merge_requests.where(source_branch: source_branch, target_branch: target_branch, source_project_id: source_project.try(:id)).opened
358 359
      similar_mrs = similar_mrs.where('id not in (?)', self.id) if self.id
      if similar_mrs.any?
J
jubianchi 已提交
360
        errors.add :validate_branches,
G
Gabriel Mazetto 已提交
361
                   "Cannot Create: This merge request already exists: #{similar_mrs.pluck(:title)}"
362
      end
363
    end
364 365
  end

366 367 368 369 370 371
  def validate_target_project
    return true if target_project.merge_requests_enabled?

    errors.add :base, 'Target project has disabled merge requests'
  end

372
  def validate_fork
373
    return true unless target_project && source_project
374
    return true if target_project == source_project
375
    return true unless source_project_missing?
376

377
    errors.add :validate_fork,
378
               'Source project is not a fork of the target project'
379 380 381
  end

  def closed_without_fork?
382
    closed? && source_project_missing?
383 384
  end

385
  def source_project_missing?
386 387 388 389
    return false unless for_fork?
    return true unless source_project

    !source_project.forked_from?(target_project)
390 391
  end

392
  def reopenable?
393
    closed? && !source_project_missing? && source_branch_exists?
K
Katarzyna Kobierska 已提交
394 395
  end

396 397
  def ensure_merge_request_diff
    merge_request_diff || create_merge_request_diff
398 399
  end

400 401 402 403 404 405 406 407 408
  def create_merge_request_diff
    merge_request_diffs.create
    reload_merge_request_diff
  end

  def reload_merge_request_diff
    merge_request_diff(true)
  end

409 410 411 412 413 414 415 416 417
  def merge_request_diff_for(diff_refs_or_sha)
    @merge_request_diffs_by_diff_refs_or_sha ||= Hash.new do |h, diff_refs_or_sha|
      diffs = merge_request_diffs.viewable.select_without_diff
      h[diff_refs_or_sha] =
        if diff_refs_or_sha.is_a?(Gitlab::Diff::DiffRefs)
          diffs.find_by_diff_refs(diff_refs_or_sha)
        else
          diffs.find_by(head_commit_sha: diff_refs_or_sha)
        end
D
Douwe Maan 已提交
418 419
    end

420
    @merge_request_diffs_by_diff_refs_or_sha[diff_refs_or_sha]
421 422
  end

423
  def reload_diff_if_branch_changed
D
Dmitriy Zaporozhets 已提交
424
    if source_branch_changed? || target_branch_changed?
425
      reload_diff
D
Dmitriy Zaporozhets 已提交
426 427 428
    end
  end

429
  def reload_diff
430 431
    return unless open?

432
    old_diff_refs = self.diff_refs
433
    create_merge_request_diff
434
    MergeRequests::MergeRequestDiffCacheService.new.execute(self)
435 436 437 438 439 440
    new_diff_refs = self.diff_refs

    update_diff_notes_positions(
      old_diff_refs: old_diff_refs,
      new_diff_refs: new_diff_refs
    )
441 442
  end

443
  def check_if_can_be_merged
444 445
    return unless unchecked?

446
    can_be_merged =
447
      !broken? && project.repository.can_be_merged?(diff_head_sha, target_branch)
448 449

    if can_be_merged
450 451 452 453
      mark_as_mergeable
    else
      mark_as_unmergeable
    end
454 455
  end

D
Dmitriy Zaporozhets 已提交
456
  def merge_event
457
    @merge_event ||= target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::MERGED).last
D
Dmitriy Zaporozhets 已提交
458 459
  end

460
  def closed_event
461
    @closed_event ||= target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::CLOSED).last
462 463
  end

464
  def work_in_progress?
T
Thomas Balthazar 已提交
465
    self.class.work_in_progress?(title)
466 467 468
  end

  def wipless_title
T
Thomas Balthazar 已提交
469 470 471 472 473
    self.class.wipless_title(self.title)
  end

  def wip_title
    self.class.wip_title(self.title)
474 475
  end

476 477
  def mergeable?(skip_ci_check: false)
    return false unless mergeable_state?(skip_ci_check: skip_ci_check)
478 479 480 481

    check_if_can_be_merged

    can_be_merged?
482 483
  end

484
  def mergeable_state?(skip_ci_check: false)
485 486 487
    return false unless open?
    return false if work_in_progress?
    return false if broken?
488
    return false unless skip_ci_check || mergeable_ci_state?
489
    return false unless mergeable_discussions_state?
490 491

    true
492 493
  end

J
James Lopez 已提交
494
  def can_cancel_merge_when_pipeline_succeeds?(current_user)
495
    can_be_merged_by?(current_user) || self.author == current_user
496 497
  end

498
  def can_remove_source_branch?(current_user)
499
    !ProtectedBranch.protected?(source_project, source_branch) &&
500
      !source_project.root_ref?(source_branch) &&
H
http://jneen.net/ 已提交
501
      Ability.allowed?(current_user, :push_code, source_project) &&
502
      diff_head_commit == source_branch_head
503 504
  end

505
  def should_remove_source_branch?
506
    Gitlab::Utils.to_boolean(merge_params['should_remove_source_branch'])
507 508 509
  end

  def force_remove_source_branch?
510
    Gitlab::Utils.to_boolean(merge_params['force_remove_source_branch'])
511 512 513 514 515 516
  end

  def remove_source_branch?
    should_remove_source_branch? || force_remove_source_branch?
  end

517
  def related_notes
518 519 520 521
    # Fetch comments only from last 100 commits
    commits_for_notes_limit = 100
    commit_ids = commits.last(commits_for_notes_limit).map(&:id)

522 523
    Note.where(
      "(project_id = :target_project_id AND noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR" +
524
      "((project_id = :source_project_id OR project_id = :target_project_id) AND noteable_type = 'Commit' AND commit_id IN (:commit_ids))",
525
      mr_id: id,
526 527 528
      commit_ids: commit_ids,
      target_project_id: target_project_id,
      source_project_id: source_project_id
529
    )
530
  end
531

532
  alias_method :discussion_notes, :related_notes
533

534 535 536
  def mergeable_discussions_state?
    return true unless project.only_allow_merge_if_all_discussions_are_resolved?

537
    !discussions_to_be_resolved?
538 539
  end

K
Kirill Zaitsev 已提交
540 541
  def hook_attrs
    attrs = {
542
      source: source_project.try(:hook_attrs),
K
Kirill Zaitsev 已提交
543
      target: target_project.hook_attrs,
544
      last_commit: nil,
545 546 547 548
      work_in_progress: work_in_progress?,
      total_time_spent: total_time_spent,
      human_total_time_spent: human_total_time_spent,
      human_time_estimate: human_time_estimate
K
Kirill Zaitsev 已提交
549 550
    }

551
    if diff_head_commit
D
Douwe Maan 已提交
552
      attrs[:last_commit] = diff_head_commit.hook_attrs
K
Kirill Zaitsev 已提交
553 554 555 556 557
    end

    attributes.merge!(attrs)
  end

I
Izaak Alpert 已提交
558 559 560 561
  def for_fork?
    target_project != source_project
  end

562 563 564 565
  def project
    target_project
  end

566 567 568 569
  # 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.
570
  # This optimization does not apply to issues from external sources.
571
  def cache_merge_request_closes_issues!(current_user)
572 573
    return if project.has_external_issue_tracker?

574
    transaction do
575
      self.merge_requests_closing_issues.delete_all
576

577
      closes_issues(current_user).each do |issue|
578
        self.merge_requests_closing_issues.create!(issue: issue)
579 580 581 582
      end
    end
  end

583
  # Return the set of issues that will be closed if this merge request is accepted.
584
  def closes_issues(current_user = self.author)
585
    if target_branch == project.default_branch
586
      messages = [title, description]
587
      messages.concat(commits.map(&:safe_message)) if merge_request_diff
588 589 590

      Gitlab::ClosingIssueExtractor.new(project, current_user).
        closed_by_message(messages.join("\n"))
591 592 593 594 595
    else
      []
    end
  end

596
  def issues_mentioned_but_not_closing(current_user)
597
    return [] unless target_branch == project.default_branch
598

599
    ext = Gitlab::ReferenceExtractor.new(project, current_user)
600
    ext.analyze("#{title}\n#{description}")
601

602
    ext.issues - closes_issues(current_user)
603 604
  end

605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620
  def target_project_path
    if target_project
      target_project.path_with_namespace
    else
      "(removed)"
    end
  end

  def source_project_path
    if source_project
      source_project.path_with_namespace
    else
      "(removed)"
    end
  end

621 622
  def source_project_namespace
    if source_project && source_project.namespace
623
      source_project.namespace.full_path
624 625 626 627 628
    else
      "(removed)"
    end
  end

629 630
  def target_project_namespace
    if target_project && target_project.namespace
631
      target_project.namespace.full_path
632 633 634 635 636
    else
      "(removed)"
    end
  end

637 638 639 640 641 642 643 644 645 646 647 648
  def source_branch_exists?
    return false unless self.source_project

    self.source_project.repository.branch_names.include?(self.source_branch)
  end

  def target_branch_exists?
    return false unless self.target_project

    self.target_project.repository.branch_names.include?(self.target_branch)
  end

649
  def merge_commit_message(include_description: false)
650 651 652 653
    closes_issues_references = closes_issues.map do |issue|
      issue.to_reference(target_project)
    end

654 655 656 657
    message = [
      "Merge branch '#{source_branch}' into '#{target_branch}'",
      title
    ]
658

659
    if !include_description && closes_issues_references.present?
660
      message << "Closes #{closes_issues_references.to_sentence}"
661 662
    end

663
    message << "#{description}" if include_description && description.present?
664 665
    message << "See merge request #{to_reference}"

666
    message.join("\n\n")
667
  end
668

J
James Lopez 已提交
669 670
  def reset_merge_when_pipeline_succeeds
    return unless merge_when_pipeline_succeeds?
671

J
James Lopez 已提交
672
    self.merge_when_pipeline_succeeds = false
Z
Zeger-Jan van de Weg 已提交
673
    self.merge_user = nil
674 675 676 677
    if merge_params
      merge_params.delete('should_remove_source_branch')
      merge_params.delete('commit_message')
    end
Z
Zeger-Jan van de Weg 已提交
678 679 680 681

    self.save
  end

682
  # Return array of possible target branches
S
Steven Burgart 已提交
683
  # depends on target project of MR
684 685 686 687 688 689 690 691 692
  def target_branches
    if target_project.nil?
      []
    else
      target_project.repository.branch_names
    end
  end

  # Return array of possible source branches
S
Steven Burgart 已提交
693
  # depends on source project of MR
694 695 696 697 698 699 700
  def source_branches
    if source_project.nil?
      []
    else
      source_project.repository.branch_names
    end
  end
701 702

  def locked_long_ago?
B
Ben Bodenmiller 已提交
703 704 705
    return false unless locked?

    locked_at.nil? || locked_at < (Time.now - 1.day)
706
  end
707 708

  def has_ci?
709 710 711 712
    has_ci_integration = source_project.try(:ci_service)
    uses_gitlab_ci = all_pipelines.any?

    (has_ci_integration || uses_gitlab_ci) && commits.any?
713 714 715 716 717
  end

  def branch_missing?
    !source_branch_exists? || !target_branch_exists?
  end
718

719
  def broken?
720
    has_no_commits? || branch_missing? || cannot_be_merged?
721 722
  end

723
  def can_be_merged_by?(user)
724 725 726 727 728 729 730
    access = ::Gitlab::UserAccess.new(user, project: project)
    access.can_push_to_branch?(target_branch) || access.can_merge_to_branch?(target_branch)
  end

  def can_be_merged_via_command_line_by?(user)
    access = ::Gitlab::UserAccess.new(user, project: project)
    access.can_push_to_branch?(target_branch)
731 732
  end

733
  def mergeable_ci_state?
J
James Lopez 已提交
734
    return true unless project.only_allow_merge_if_pipeline_succeeds?
735

736
    !head_pipeline || head_pipeline.success? || head_pipeline.skipped?
737 738
  end

D
Douwe Maan 已提交
739
  def environments_for(current_user)
740
    return [] unless diff_head_commit
741

D
Douwe Maan 已提交
742 743 744
    @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
745

D
Douwe Maan 已提交
746 747 748 749
      if source_project
        envs.concat EnvironmentsFinder.new(source_project, current_user,
          ref: source_branch, commit: diff_head_commit).execute
      end
750

D
Douwe Maan 已提交
751
      h[current_user] = envs.uniq
752
    end
D
Douwe Maan 已提交
753 754

    @environments[current_user]
755 756
  end

757 758 759 760 761 762 763 764 765
  def state_human_name
    if merged?
      "Merged"
    elsif closed?
      "Closed"
    else
      "Open"
    end
  end
766

767 768 769 770 771 772 773 774 775 776
  def state_icon_name
    if merged?
      "check"
    elsif closed?
      "times"
    else
      "circle-o"
    end
  end

777 778 779 780
  def fetch_ref
    target_project.repository.fetch_ref(
      source_project.repository.path_to_repo,
      "refs/heads/#{source_branch}",
781
      ref_path
782 783 784
    )
  end

785 786 787 788
  def ref_path
    "refs/merge-requests/#{iid}/head"
  end

789 790
  def ref_fetched?
    project.repository.ref_exists?(ref_path)
791 792 793
  end

  def ensure_ref_fetched
794
    fetch_ref unless ref_fetched?
795 796
  end

797 798 799 800 801 802 803 804
  def in_locked_state
    begin
      lock_mr
      yield
    ensure
      unlock_mr if locked?
    end
  end
805

806 807 808
  def diverged_commits_count
    cache = Rails.cache.read(:"merge_request_#{id}_diverged_commits")

809
    if cache.blank? || cache[:source_sha] != source_branch_sha || cache[:target_sha] != target_branch_sha
810
      cache = {
811 812
        source_sha: source_branch_sha,
        target_sha: target_branch_sha,
813 814 815 816 817 818 819 820 821
        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
822
    return 0 unless source_branch_sha && target_branch_sha
823

824
    Gitlab::Git::Commit.between(target_project.repository.raw_repository, source_branch_sha, target_branch_sha).size
825
  end
826
  private :compute_diverged_commits_count
827 828 829 830 831

  def diverged_from_target_branch?
    diverged_commits_count > 0
  end

832
  def head_pipeline
833
    return unless diff_head_sha && source_project
834

835
    @head_pipeline ||= source_project.pipeline_for(source_branch, diff_head_sha)
836
  end
837

838
  def all_pipelines
839
    return Ci::Pipeline.none unless source_project
840

841
    @all_pipelines ||= source_project.pipelines
842 843
      .where(sha: all_commits_sha, ref: source_branch)
      .order(id: :desc)
844
  end
845

846
  # Note that this could also return SHA from now dangling commits
847
  #
848
  def all_commits_sha
849 850
    if persisted?
      merge_request_diffs.flat_map(&:commits_sha).uniq
851 852
    elsif compare_commits
      compare_commits.to_a.reverse.map(&:id)
853
    else
854
      [diff_head_sha]
855
    end
856 857
  end

858 859 860 861
  def merge_commit
    @merge_commit ||= project.commit(merge_commit_sha) if merge_commit_sha
  end

862
  def can_be_reverted?(current_user)
863
    merge_commit && !merge_commit.has_been_reverted?(current_user, self)
864
  end
865 866 867 868

  def can_be_cherry_picked?
    merge_commit
  end
869

870
  def has_complete_diff_refs?
871
    diff_sha_refs && diff_sha_refs.complete?
872 873
  end

874
  def update_diff_notes_positions(old_diff_refs:, new_diff_refs:)
875
    return unless has_complete_diff_refs?
876 877
    return if new_diff_refs == old_diff_refs

878 879
    active_diff_notes = self.notes.new_diff_notes.select do |note|
      note.active?(old_diff_refs)
880 881 882 883 884 885 886 887 888 889 890 891 892 893
    end

    return if active_diff_notes.empty?

    paths = active_diff_notes.flat_map { |n| n.diff_file.paths }.uniq

    service = Notes::DiffPositionUpdateService.new(
      self.project,
      nil,
      old_diff_refs: old_diff_refs,
      new_diff_refs: new_diff_refs,
      paths: paths
    )

V
Valery Sizov 已提交
894 895 896 897 898
    transaction do
      active_diff_notes.each do |note|
        service.execute(note)
        Gitlab::Timeless.timeless(note, &:save)
      end
899 900 901
    end
  end

902 903 904
  def keep_around_commit
    project.repository.keep_around(self.merge_commit_sha)
  end
905 906 907 908 909

  def conflicts
    @conflicts ||= Gitlab::Conflict::FileCollection.new(self)
  end

910 911 912 913 914
  def conflicts_can_be_resolved_by?(user)
    access = ::Gitlab::UserAccess.new(user, project: source_project)
    access.can_push_to_branch?(source_branch)
  end

915 916 917 918 919
  def conflicts_can_be_resolved_in_ui?
    return @conflicts_can_be_resolved_in_ui if defined?(@conflicts_can_be_resolved_in_ui)

    return @conflicts_can_be_resolved_in_ui = false unless cannot_be_merged?
    return @conflicts_can_be_resolved_in_ui = false unless has_complete_diff_refs?
920 921

    begin
922 923 924 925 926
      # Try to parse each conflict. If the MR's mergeable status hasn't been updated,
      # ensure that we don't say there are conflicts to resolve when there are no conflict
      # files.
      conflicts.files.each(&:lines)
      @conflicts_can_be_resolved_in_ui = conflicts.files.length > 0
927
    rescue Rugged::OdbError, Gitlab::Conflict::Parser::UnresolvableError, Gitlab::Conflict::FileCollection::ConflictSideMissing
928
      @conflicts_can_be_resolved_in_ui = false
929 930
    end
  end
931 932

  def has_commits?
933
    merge_request_diff && commits_count > 0
934 935 936 937 938
  end

  def has_no_commits?
    !has_commits?
  end
939 940 941 942 943 944 945 946 947 948 949 950

  def mergeable_with_slash_command?(current_user, autocomplete_precheck: false, last_diff_sha: nil)
    return false unless can_be_merged_by?(current_user)

    return true if autocomplete_precheck

    return false unless mergeable?(skip_ci_check: true)
    return false if head_pipeline && !(head_pipeline.success? || head_pipeline.active?)
    return false if last_diff_sha != diff_head_sha

    true
  end
D
Dmitriy Zaporozhets 已提交
951
end