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

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

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

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

Z
Zeger-Jan van de Weg 已提交
19 20
  serialize :merge_params, Hash

21 22
  after_create :ensure_merge_request_diff, unless: :importing?
  after_update :reload_diff_if_branch_changed
23

S
Sean McGivern 已提交
24
  delegate :commits, :real_size, to: :merge_request_diff, prefix: nil
I
Izaak Alpert 已提交
25

D
Dmitriy Zaporozhets 已提交
26 27 28 29
  # 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 已提交
30 31
  # Temporary fields to store compare vars
  # when creating new merge request
J
Jacob Vosmaer 已提交
32
  attr_accessor :can_be_created, :compare_commits, :compare
D
Dmitriy Zaporozhets 已提交
33

A
Andrew8xx8 已提交
34
  state_machine :state, initial: :opened do
A
Andrew8xx8 已提交
35 36 37 38
    event :close do
      transition [:reopened, :opened] => :closed
    end

39
    event :mark_as_merged do
D
Dmitriy Zaporozhets 已提交
40
      transition [:reopened, :opened, :locked] => :merged
A
Andrew8xx8 已提交
41 42 43
    end

    event :reopen do
A
Andrew8xx8 已提交
44
      transition closed: :reopened
A
Andrew8xx8 已提交
45 46
    end

47
    event :lock_mr do
D
Dmitriy Zaporozhets 已提交
48 49 50
      transition [:reopened, :opened] => :locked
    end

51
    event :unlock_mr do
D
Dmitriy Zaporozhets 已提交
52 53 54
      transition locked: :reopened
    end

55 56 57 58 59
    after_transition any => :locked do |merge_request, transition|
      merge_request.locked_at = Time.now
      merge_request.save
    end

60
    after_transition locked: (any - :locked) do |merge_request, transition|
61 62 63 64
      merge_request.locked_at = nil
      merge_request.save
    end

A
Andrew8xx8 已提交
65 66 67 68
    state :opened
    state :reopened
    state :closed
    state :merged
D
Dmitriy Zaporozhets 已提交
69
    state :locked
A
Andrew8xx8 已提交
70 71
  end

72 73 74 75 76 77
  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
78
      transition [:unchecked, :cannot_be_merged] => :can_be_merged
79 80 81
    end

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

85
    state :unchecked
86 87
    state :can_be_merged
    state :cannot_be_merged
88 89

    around_transition do |merge_request, transition, block|
90
      Gitlab::Timeless.timeless(merge_request, &block)
91
    end
92
  end
93

94
  validates :source_project, presence: true, unless: [:allow_broken, :importing?, :closed_without_fork?]
A
Andrey Kumanyaev 已提交
95
  validates :source_branch, presence: true
I
Izaak Alpert 已提交
96
  validates :target_project, presence: true
A
Andrey Kumanyaev 已提交
97
  validates :target_branch, presence: true
Z
Zeger-Jan van de Weg 已提交
98
  validates :merge_user, presence: true, if: :merge_when_build_succeeds?
99 100
  validate :validate_branches, unless: [:allow_broken, :importing?, :closed_without_fork?]
  validate :validate_fork, unless: :closed_without_fork?
D
Dmitriy Zaporozhets 已提交
101

I
Izaak Alpert 已提交
102
  scope :by_branch, ->(branch_name) { where("(source_branch LIKE :branch) OR (target_branch LIKE :branch)", branch: branch_name) }
A
Andrew8xx8 已提交
103
  scope :cared, ->(user) { where('assignee_id = :user OR author_id = :user', user: user.id) }
104
  scope :by_milestone, ->(milestone) { where(milestone_id: milestone) }
105
  scope :of_projects, ->(ids) { where(target_project_id: ids) }
106
  scope :from_project, ->(project) { where(source_project_id: project.id) }
107 108
  scope :merged, -> { with_state(:merged) }
  scope :closed_and_merged, -> { with_states(:closed, :merged) }
S
Scott Le 已提交
109
  scope :from_source_branches, ->(branches) { where(source_branch: branches) }
110

111 112 113
  scope :join_project, -> { joins(:target_project) }
  scope :references_project, -> { references(:target_project) }

114 115
  after_save :keep_around_commit

116 117 118 119
  def self.reference_prefix
    '!'
  end

120 121 122 123
  # Pattern used to extract `!123` merge request references from text
  #
  # This pattern supports cross-project references.
  def self.reference_pattern
124
    @reference_pattern ||= %r{
125
      (#{Project.reference_pattern})?
126 127 128 129
      #{Regexp.escape(reference_prefix)}(?<merge_request>\d+)
    }x
  end

130
  def self.link_reference_pattern
131
    @link_reference_pattern ||= super("merge_requests", /(?<merge_request>\d+)/)
132 133
  end

134 135 136 137
  def self.reference_valid?(reference)
    reference.to_i > 0 && reference.to_i <= Gitlab::Database::MAX_INT_VALUE
  end

138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155
  # 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)
    source = where(source_project_id: relation).select(:id)
    target = where(target_project_id: relation).select(:id)
    union  = Gitlab::SQL::Union.new([source, target])

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

156 157 158 159 160 161 162 163 164 165
  def to_reference(from_project = nil)
    reference = "#{self.class.reference_prefix}#{iid}"

    if cross_project_reference?(from_project)
      reference = project.to_reference + reference
    end

    reference
  end

166 167
  def first_commit
    merge_request_diff ? merge_request_diff.first_commit : compare_commits.first
168
  end
169

170
  def raw_diffs(*args)
171
    merge_request_diff ? merge_request_diff.raw_diffs(*args) : compare.raw_diffs(*args)
S
Sean McGivern 已提交
172 173
  end

174
  def diffs(diff_options = nil)
175 176
    if compare
      compare.diffs(diff_options)
177
    else
178
      merge_request_diff.diffs(diff_options)
179
    end
S
Sean McGivern 已提交
180 181
  end

J
Jacob Vosmaer 已提交
182 183 184 185
  def diff_size
    merge_request_diff.size
  end

186
  def diff_base_commit
187
    if persisted?
188
      merge_request_diff.base_commit
189 190
    else
      branch_merge_base_commit
191 192 193 194 195 196 197 198 199
    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 已提交
200 201 202
  # 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.
203 204 205 206 207 208 209 210 211
  def likely_diff_base_commit
    first_commit.parent || first_commit
  end

  def diff_start_commit
    if persisted?
      merge_request_diff.start_commit
    else
      target_branch_head
212 213 214
    end
  end

215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242
  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 已提交
243
    source_project.repository.commit(source_branch_ref) if source_branch_ref
244 245 246 247
  end

  def target_branch_head
    target_branch_ref = @target_branch_sha || target_branch
S
Sean McGivern 已提交
248
    target_project.repository.commit(target_branch_ref) if target_branch_ref
249 250
  end

251 252 253 254 255 256 257 258 259
  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

260
  def target_branch_sha
261
    @target_branch_sha || target_branch_head.try(:sha)
262 263 264
  end

  def source_branch_sha
265
    @source_branch_sha || source_branch_head.try(:sha)
266 267
  end

268 269 270 271 272 273 274 275
  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
    )
276 277
  end

278 279
  # Return diff_refs instance trying to not touch the git repository
  def diff_sha_refs
280
    if merge_request_diff && merge_request_diff.diff_refs_by_sha?
281
      merge_request_diff.diff_refs
282
    else
283
      diff_refs
284
    end
285 286
  end

287 288 289 290
  def branch_merge_base_sha
    branch_merge_base_commit.try(:sha)
  end

291
  def validate_branches
292
    if target_project == source_project && target_branch == source_branch
I
Izaak Alpert 已提交
293
      errors.add :branch_conflict, "You can not use same project/branch for source and target"
294
    end
295

296
    if opened? || reopened?
297
      similar_mrs = self.target_project.merge_requests.where(source_branch: source_branch, target_branch: target_branch, source_project_id: source_project.try(:id)).opened
298 299
      similar_mrs = similar_mrs.where('id not in (?)', self.id) if self.id
      if similar_mrs.any?
J
jubianchi 已提交
300
        errors.add :validate_branches,
G
Gabriel Mazetto 已提交
301
                   "Cannot Create: This merge request already exists: #{similar_mrs.pluck(:title)}"
302
      end
303
    end
304 305
  end

306
  def validate_fork
307
    return true unless target_project && source_project
308
    return true if target_project == source_project
K
Katarzyna Kobierska 已提交
309
    return true unless forked_source_project_missing?
310

311
    errors.add :validate_fork,
312
               'Source project is not a fork of the target project'
313 314 315
  end

  def closed_without_fork?
316
    closed? && (forked_source_project_missing? || !source_project)
317 318
  end

K
Katarzyna Kobierska 已提交
319
  def forked_source_project_missing?
320 321 322 323
    return false unless for_fork?
    return true unless source_project

    !source_project.forked_from?(target_project)
324 325
  end

326 327
  def ensure_merge_request_diff
    merge_request_diff || create_merge_request_diff
328 329
  end

330 331 332 333 334 335 336 337 338
  def create_merge_request_diff
    merge_request_diffs.create
    reload_merge_request_diff
  end

  def reload_merge_request_diff
    merge_request_diff(true)
  end

339
  def reload_diff_if_branch_changed
D
Dmitriy Zaporozhets 已提交
340
    if source_branch_changed? || target_branch_changed?
341
      reload_diff
D
Dmitriy Zaporozhets 已提交
342 343 344
    end
  end

345
  def reload_diff
346 347
    return unless open?

348
    old_diff_refs = self.diff_refs
349
    create_merge_request_diff
350
    MergeRequests::MergeRequestDiffCacheService.new.execute(self)
351 352 353 354 355 356
    new_diff_refs = self.diff_refs

    update_diff_notes_positions(
      old_diff_refs: old_diff_refs,
      new_diff_refs: new_diff_refs
    )
357 358
  end

359
  def check_if_can_be_merged
360 361
    return unless unchecked?

362
    can_be_merged =
363
      !broken? && project.repository.can_be_merged?(diff_head_sha, target_branch)
364 365

    if can_be_merged
366 367 368 369
      mark_as_mergeable
    else
      mark_as_unmergeable
    end
370 371
  end

D
Dmitriy Zaporozhets 已提交
372
  def merge_event
373
    @merge_event ||= target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::MERGED).last
D
Dmitriy Zaporozhets 已提交
374 375
  end

376
  def closed_event
377
    @closed_event ||= target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::CLOSED).last
378 379
  end

380
  WIP_REGEX = /\A\s*(\[WIP\]\s*|WIP:\s*|WIP\s+)+\s*/i.freeze
381

382
  def work_in_progress?
383
    !!(title =~ WIP_REGEX)
384 385 386 387
  end

  def wipless_title
    self.title.sub(WIP_REGEX, "")
388 389
  end

390 391
  def mergeable?(skip_ci_check: false)
    return false unless mergeable_state?(skip_ci_check: skip_ci_check)
392 393 394 395

    check_if_can_be_merged

    can_be_merged?
396 397
  end

398
  def mergeable_state?(skip_ci_check: false)
399 400 401
    return false unless open?
    return false if work_in_progress?
    return false if broken?
402
    return false unless skip_ci_check || mergeable_ci_state?
403 404

    true
405 406
  end

407 408
  def can_cancel_merge_when_build_succeeds?(current_user)
    can_be_merged_by?(current_user) || self.author == current_user
409 410
  end

411 412 413
  def can_remove_source_branch?(current_user)
    !source_project.protected_branch?(source_branch) &&
      !source_project.root_ref?(source_branch) &&
H
http://jneen.net/ 已提交
414
      Ability.allowed?(current_user, :push_code, source_project) &&
415
      diff_head_commit == source_branch_head
416 417
  end

418 419 420 421 422 423 424 425 426 427 428 429
  def should_remove_source_branch?
    merge_params['should_remove_source_branch'].present?
  end

  def force_remove_source_branch?
    merge_params['force_remove_source_branch'].present?
  end

  def remove_source_branch?
    should_remove_source_branch? || force_remove_source_branch?
  end

430
  def mr_and_commit_notes
431 432 433 434
    # Fetch comments only from last 100 commits
    commits_for_notes_limit = 100
    commit_ids = commits.last(commits_for_notes_limit).map(&:id)

435 436
    Note.where(
      "(project_id = :target_project_id AND noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR" +
437
      "((project_id = :source_project_id OR project_id = :target_project_id) AND noteable_type = 'Commit' AND commit_id IN (:commit_ids))",
438
      mr_id: id,
439 440 441
      commit_ids: commit_ids,
      target_project_id: target_project_id,
      source_project_id: source_project_id
442
    )
443
  end
444

445
  def discussions
446
    @discussions ||= self.mr_and_commit_notes.
D
Douwe Maan 已提交
447
      inc_relations_for_view.
448 449 450 451
      fresh.
      discussions
  end

452 453 454 455 456 457 458 459 460
  def diff_discussions
    @diff_discussions ||= self.notes.diff_notes.discussions
  end

  def find_diff_discussion(discussion_id)
    notes = self.notes.diff_notes.where(discussion_id: discussion_id).fresh.to_a
    return if notes.empty?

    Discussion.new(notes)
461 462
  end

463
  def discussions_resolvable?
464
    diff_discussions.any?(&:resolvable?)
465 466
  end

467
  def discussions_resolved?
468
    discussions_resolvable? && diff_discussions.none?(&:to_be_resolved?)
469 470
  end

K
Kirill Zaitsev 已提交
471 472
  def hook_attrs
    attrs = {
473
      source: source_project.try(:hook_attrs),
K
Kirill Zaitsev 已提交
474
      target: target_project.hook_attrs,
475 476
      last_commit: nil,
      work_in_progress: work_in_progress?
K
Kirill Zaitsev 已提交
477 478
    }

479 480
    if diff_head_commit
      attrs.merge!(last_commit: diff_head_commit.hook_attrs)
K
Kirill Zaitsev 已提交
481 482 483 484 485
    end

    attributes.merge!(attrs)
  end

I
Izaak Alpert 已提交
486 487 488 489
  def for_fork?
    target_project != source_project
  end

490 491 492 493
  def project
    target_project
  end

494 495 496 497
  def closes_issue?(issue)
    closes_issues.include?(issue)
  end

498
  # Return the set of issues that will be closed if this merge request is accepted.
499
  def closes_issues(current_user = self.author)
500
    if target_branch == project.default_branch
501 502 503 504
      messages = commits.map(&:safe_message) << description

      Gitlab::ClosingIssueExtractor.new(project, current_user).
        closed_by_message(messages.join("\n"))
505 506 507 508 509
    else
      []
    end
  end

510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525
  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

526 527 528 529 530 531 532 533
  def source_project_namespace
    if source_project && source_project.namespace
      source_project.namespace.path
    else
      "(removed)"
    end
  end

534 535 536 537 538 539 540 541
  def target_project_namespace
    if target_project && target_project.namespace
      target_project.namespace.path
    else
      "(removed)"
    end
  end

542 543 544 545 546 547 548 549 550 551 552 553
  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

D
Drew Blessing 已提交
554 555 556 557 558 559 560 561 562
  # Reset merge request events cache
  #
  # Since we do cache @event we need to reset cache in special cases:
  # * when a merge request is updated
  # Events cache stored like  events/23-20130109142513.
  # The cache key includes updated_at timestamp.
  # Thus it will automatically generate a new fragment
  # when the event is updated because the key changes.
  def reset_events_cache
563
    Event.reset_event_cache_for(self)
D
Drew Blessing 已提交
564 565
  end

566 567 568
  def merge_commit_message
    message = "Merge branch '#{source_branch}' into '#{target_branch}'"
    message << "\n\n"
D
Dmitriy Zaporozhets 已提交
569
    message << title.to_s
570
    message << "\n\n"
D
Dmitriy Zaporozhets 已提交
571
    message << description.to_s
572 573
    message << "\n\n"
    message << "See merge request !#{iid}"
D
Dmitriy Zaporozhets 已提交
574
    message
575
  end
576

Z
Zeger-Jan van de Weg 已提交
577 578
  def reset_merge_when_build_succeeds
    return unless merge_when_build_succeeds?
579

Z
Zeger-Jan van de Weg 已提交
580 581
    self.merge_when_build_succeeds = false
    self.merge_user = nil
582 583 584 585
    if merge_params
      merge_params.delete('should_remove_source_branch')
      merge_params.delete('commit_message')
    end
Z
Zeger-Jan van de Weg 已提交
586 587 588 589

    self.save
  end

590
  # Return array of possible target branches
S
Steven Burgart 已提交
591
  # depends on target project of MR
592 593 594 595 596 597 598 599 600
  def target_branches
    if target_project.nil?
      []
    else
      target_project.repository.branch_names
    end
  end

  # Return array of possible source branches
S
Steven Burgart 已提交
601
  # depends on source project of MR
602 603 604 605 606 607 608
  def source_branches
    if source_project.nil?
      []
    else
      source_project.repository.branch_names
    end
  end
609 610

  def locked_long_ago?
B
Ben Bodenmiller 已提交
611 612 613
    return false unless locked?

    locked_at.nil? || locked_at < (Time.now - 1.day)
614
  end
615 616 617 618 619 620 621 622

  def has_ci?
    source_project.ci_service && commits.any?
  end

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

624 625 626 627
  def broken?
    self.commits.blank? || branch_missing? || cannot_be_merged?
  end

628
  def can_be_merged_by?(user)
629 630 631 632 633 634 635
    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)
636 637
  end

638 639
  def mergeable_ci_state?
    return true unless project.only_allow_merge_if_build_succeeds?
640

R
Rémy Coutable 已提交
641
    !pipeline || pipeline.success?
642 643
  end

644
  def environments
645 646
    return unless diff_head_commit

647
    target_project.environments.select do |environment|
648
      environment.includes_commit?(diff_head_commit)
649 650 651
    end
  end

652 653 654 655 656 657 658 659 660
  def state_human_name
    if merged?
      "Merged"
    elsif closed?
      "Closed"
    else
      "Open"
    end
  end
661

662 663 664 665 666 667 668 669 670 671
  def state_icon_name
    if merged?
      "check"
    elsif closed?
      "times"
    else
      "circle-o"
    end
  end

672 673 674 675
  def fetch_ref
    target_project.repository.fetch_ref(
      source_project.repository.path_to_repo,
      "refs/heads/#{source_branch}",
676
      ref_path
677 678 679
    )
  end

680 681 682 683
  def ref_path
    "refs/merge-requests/#{iid}/head"
  end

684 685
  def ref_fetched?
    project.repository.ref_exists?(ref_path)
686 687 688
  end

  def ensure_ref_fetched
689
    fetch_ref unless ref_fetched?
690 691
  end

692 693 694 695 696 697 698 699
  def in_locked_state
    begin
      lock_mr
      yield
    ensure
      unlock_mr if locked?
    end
  end
700

701 702 703
  def diverged_commits_count
    cache = Rails.cache.read(:"merge_request_#{id}_diverged_commits")

704
    if cache.blank? || cache[:source_sha] != source_branch_sha || cache[:target_sha] != target_branch_sha
705
      cache = {
706 707
        source_sha: source_branch_sha,
        target_sha: target_branch_sha,
708 709 710 711 712 713 714 715 716
        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
717
    return 0 unless source_branch_sha && target_branch_sha
718

719
    Gitlab::Git::Commit.between(target_project.repository.raw_repository, source_branch_sha, target_branch_sha).size
720
  end
721
  private :compute_diverged_commits_count
722 723 724 725 726

  def diverged_from_target_branch?
    diverged_commits_count > 0
  end

727 728 729 730
  def commits_sha
    commits.map(&:sha)
  end

731
  def pipeline
732
    return unless diff_head_sha && source_project
733

734
    @pipeline ||= source_project.pipeline_for(source_branch, diff_head_sha)
735
  end
736

737 738 739 740 741 742 743
  def all_pipelines
    @all_pipelines ||=
      if diff_head_sha && source_project
        source_project.pipelines.order(id: :desc).where(sha: commits_sha, ref: source_branch)
      end
  end

744 745 746 747
  def merge_commit
    @merge_commit ||= project.commit(merge_commit_sha) if merge_commit_sha
  end

748 749
  def can_be_reverted?(current_user = nil)
    merge_commit && !merge_commit.has_been_reverted?(current_user, self)
750
  end
751 752 753 754

  def can_be_cherry_picked?
    merge_commit
  end
755

756
  def has_complete_diff_refs?
757
    diff_sha_refs && diff_sha_refs.complete?
758 759
  end

760
  def update_diff_notes_positions(old_diff_refs:, new_diff_refs:)
761
    return unless has_complete_diff_refs?
762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785
    return if new_diff_refs == old_diff_refs

    active_diff_notes = self.notes.diff_notes.select do |note|
      note.new_diff_note? && note.active?(old_diff_refs)
    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
    )

    active_diff_notes.each do |note|
      service.execute(note)
      Gitlab::Timeless.timeless(note, &:save)
    end
  end

786 787 788
  def keep_around_commit
    project.repository.keep_around(self.merge_commit_sha)
  end
789 790 791 792 793

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

794 795 796 797 798
  def conflicts_can_be_resolved_by?(user)
    access = ::Gitlab::UserAccess.new(user, project: source_project)
    access.can_push_to_branch?(source_branch)
  end

799 800 801 802 803
  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?
804 805

    begin
806 807 808 809 810
      # 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
811
    rescue Rugged::OdbError, Gitlab::Conflict::Parser::ParserError, Gitlab::Conflict::FileCollection::ConflictSideMissing
812
      @conflicts_can_be_resolved_in_ui = false
813 814
    end
  end
D
Dmitriy Zaporozhets 已提交
815
end