merge_request.rb 24.3 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

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

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

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

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

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

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

    event :reopen do
A
Andrew8xx8 已提交
46
      transition closed: :reopened
A
Andrew8xx8 已提交
47 48
    end

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

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

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

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

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

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

    event :mark_as_unmergeable do
84
      transition [:unchecked, :can_be_merged] => :cannot_be_merged
85 86
    end

87
    state :unchecked
88 89
    state :can_be_merged
    state :cannot_be_merged
90 91

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

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

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

114 115 116
  scope :join_project, -> { joins(:target_project) }
  scope :references_project, -> { references(:target_project) }

117 118
  after_save :keep_around_commit

119 120 121 122
  def self.reference_prefix
    '!'
  end

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

133
  def self.link_reference_pattern
134
    @link_reference_pattern ||= super("merge_requests", /(?<merge_request>\d+)/)
135 136
  end

137 138 139 140
  def self.reference_valid?(reference)
    reference.to_i > 0 && reference.to_i <= Gitlab::Database::MAX_INT_VALUE
  end

141 142 143 144
  def self.project_foreign_key
    'target_project_id'
  end

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)
M
mhasbini 已提交
156 157 158 159
    # 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)
160 161 162 163 164
    union  = Gitlab::SQL::Union.new([source, target])

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

T
Thomas Balthazar 已提交
165 166 167 168 169 170 171 172 173 174 175 176 177 178
  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

179
  # `from` argument can be a Namespace or Project.
180
  def to_reference(from = nil, full: false)
181 182
    reference = "#{self.class.reference_prefix}#{iid}"

183
    "#{project.to_reference(from, full: full)}#{reference}"
184 185
  end

186 187
  def first_commit
    merge_request_diff ? merge_request_diff.first_commit : compare_commits.first
188
  end
189

190
  def raw_diffs(*args)
191
    merge_request_diff ? merge_request_diff.raw_diffs(*args) : compare.raw_diffs(*args)
S
Sean McGivern 已提交
192 193
  end

194
  def diffs(diff_options = nil)
195 196
    if compare
      compare.diffs(diff_options)
197
    else
198
      merge_request_diff.diffs(diff_options)
199
    end
S
Sean McGivern 已提交
200 201
  end

J
Jacob Vosmaer 已提交
202
  def diff_size
S
Sean McGivern 已提交
203 204 205 206 207
    # The `#diffs` method ends up at an instance of a class inheriting from
    # `Gitlab::Diff::FileCollection::Base`, so use those options as defaults
    # here too, to get the same diff size without performing highlighting.
    #
    opts = Gitlab::Diff::FileCollection::Base.default_options.merge(diff_options || {})
208 209

    raw_diffs(opts).size
J
Jacob Vosmaer 已提交
210 211
  end

212
  def diff_base_commit
213
    if persisted?
214
      merge_request_diff.base_commit
215 216
    else
      branch_merge_base_commit
217 218 219 220 221 222 223 224 225
    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 已提交
226 227 228
  # 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.
229
  def likely_diff_base_commit
230
    first_commit.try(:parent) || first_commit
231 232 233 234 235 236 237
  end

  def diff_start_commit
    if persisted?
      merge_request_diff.start_commit
    else
      target_branch_head
238 239 240
    end
  end

241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268
  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 已提交
269
    source_project.repository.commit(source_branch_ref) if source_branch_ref
270 271 272 273
  end

  def target_branch_head
    target_branch_ref = @target_branch_sha || target_branch
S
Sean McGivern 已提交
274
    target_project.repository.commit(target_branch_ref) if target_branch_ref
275 276
  end

277 278 279 280 281 282 283 284 285
  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

286
  def target_branch_sha
287
    @target_branch_sha || target_branch_head.try(:sha)
288 289 290
  end

  def source_branch_sha
291
    @source_branch_sha || source_branch_head.try(:sha)
292 293
  end

294 295 296 297 298 299 300 301
  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
    )
302 303
  end

304 305
  # Return diff_refs instance trying to not touch the git repository
  def diff_sha_refs
306
    if merge_request_diff && merge_request_diff.diff_refs_by_sha?
307
      merge_request_diff.diff_refs
308
    else
309
      diff_refs
310
    end
311 312
  end

313 314 315 316
  def branch_merge_base_sha
    branch_merge_base_commit.try(:sha)
  end

317
  def validate_branches
318
    if target_project == source_project && target_branch == source_branch
I
Izaak Alpert 已提交
319
      errors.add :branch_conflict, "You can not use same project/branch for source and target"
320
    end
321

322
    if opened? || reopened?
323
      similar_mrs = self.target_project.merge_requests.where(source_branch: source_branch, target_branch: target_branch, source_project_id: source_project.try(:id)).opened
324 325
      similar_mrs = similar_mrs.where('id not in (?)', self.id) if self.id
      if similar_mrs.any?
J
jubianchi 已提交
326
        errors.add :validate_branches,
G
Gabriel Mazetto 已提交
327
                   "Cannot Create: This merge request already exists: #{similar_mrs.pluck(:title)}"
328
      end
329
    end
330 331
  end

332
  def validate_fork
333
    return true unless target_project && source_project
334
    return true if target_project == source_project
335
    return true unless source_project_missing?
336

337
    errors.add :validate_fork,
338
               'Source project is not a fork of the target project'
339 340 341
  end

  def closed_without_fork?
342
    closed? && source_project_missing?
343 344
  end

345
  def source_project_missing?
346 347 348 349
    return false unless for_fork?
    return true unless source_project

    !source_project.forked_from?(target_project)
350 351
  end

352
  def reopenable?
353
    closed? && !source_project_missing? && source_branch_exists?
K
Katarzyna Kobierska 已提交
354 355
  end

356 357
  def ensure_merge_request_diff
    merge_request_diff || create_merge_request_diff
358 359
  end

360 361 362 363 364 365 366 367 368
  def create_merge_request_diff
    merge_request_diffs.create
    reload_merge_request_diff
  end

  def reload_merge_request_diff
    merge_request_diff(true)
  end

369
  def merge_request_diff_for(diff_refs)
D
Douwe Maan 已提交
370
    @merge_request_diffs_by_diff_refs ||= Hash.new do |h, diff_refs|
D
Douwe Maan 已提交
371
      h[diff_refs] = merge_request_diffs.viewable.select_without_diff.find_by_diff_refs(diff_refs)
D
Douwe Maan 已提交
372 373 374
    end

    @merge_request_diffs_by_diff_refs[diff_refs]
375 376
  end

377
  def reload_diff_if_branch_changed
D
Dmitriy Zaporozhets 已提交
378
    if source_branch_changed? || target_branch_changed?
379
      reload_diff
D
Dmitriy Zaporozhets 已提交
380 381 382
    end
  end

383
  def reload_diff
384 385
    return unless open?

386
    old_diff_refs = self.diff_refs
387
    create_merge_request_diff
388
    MergeRequests::MergeRequestDiffCacheService.new.execute(self)
389 390 391 392 393 394
    new_diff_refs = self.diff_refs

    update_diff_notes_positions(
      old_diff_refs: old_diff_refs,
      new_diff_refs: new_diff_refs
    )
395 396
  end

397
  def check_if_can_be_merged
398 399
    return unless unchecked?

400
    can_be_merged =
401
      !broken? && project.repository.can_be_merged?(diff_head_sha, target_branch)
402 403

    if can_be_merged
404 405 406 407
      mark_as_mergeable
    else
      mark_as_unmergeable
    end
408 409
  end

D
Dmitriy Zaporozhets 已提交
410
  def merge_event
411
    @merge_event ||= target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::MERGED).last
D
Dmitriy Zaporozhets 已提交
412 413
  end

414
  def closed_event
415
    @closed_event ||= target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::CLOSED).last
416 417
  end

418
  def work_in_progress?
T
Thomas Balthazar 已提交
419
    self.class.work_in_progress?(title)
420 421 422
  end

  def wipless_title
T
Thomas Balthazar 已提交
423 424 425 426 427
    self.class.wipless_title(self.title)
  end

  def wip_title
    self.class.wip_title(self.title)
428 429
  end

430 431
  def mergeable?(skip_ci_check: false)
    return false unless mergeable_state?(skip_ci_check: skip_ci_check)
432 433 434 435

    check_if_can_be_merged

    can_be_merged?
436 437
  end

438
  def mergeable_state?(skip_ci_check: false)
439 440 441
    return false unless open?
    return false if work_in_progress?
    return false if broken?
442
    return false unless skip_ci_check || mergeable_ci_state?
443
    return false unless mergeable_discussions_state?
444 445

    true
446 447
  end

J
James Lopez 已提交
448
  def can_cancel_merge_when_pipeline_succeeds?(current_user)
449
    can_be_merged_by?(current_user) || self.author == current_user
450 451
  end

452
  def can_remove_source_branch?(current_user)
453
    !ProtectedBranch.protected?(source_project, source_branch) &&
454
      !source_project.root_ref?(source_branch) &&
H
http://jneen.net/ 已提交
455
      Ability.allowed?(current_user, :push_code, source_project) &&
456
      diff_head_commit == source_branch_head
457 458
  end

459
  def should_remove_source_branch?
460
    Gitlab::Utils.to_boolean(merge_params['should_remove_source_branch'])
461 462 463
  end

  def force_remove_source_branch?
464
    Gitlab::Utils.to_boolean(merge_params['force_remove_source_branch'])
465 466 467 468 469 470
  end

  def remove_source_branch?
    should_remove_source_branch? || force_remove_source_branch?
  end

471
  def related_notes
472 473 474 475
    # Fetch comments only from last 100 commits
    commits_for_notes_limit = 100
    commit_ids = commits.last(commits_for_notes_limit).map(&:id)

476 477
    Note.where(
      "(project_id = :target_project_id AND noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR" +
478
      "((project_id = :source_project_id OR project_id = :target_project_id) AND noteable_type = 'Commit' AND commit_id IN (:commit_ids))",
479
      mr_id: id,
480 481 482
      commit_ids: commit_ids,
      target_project_id: target_project_id,
      source_project_id: source_project_id
483
    )
484
  end
485

486
  alias_method :discussion_notes, :related_notes
487

488 489 490
  def mergeable_discussions_state?
    return true unless project.only_allow_merge_if_all_discussions_are_resolved?

491
    !discussions_to_be_resolved?
492 493
  end

K
Kirill Zaitsev 已提交
494 495
  def hook_attrs
    attrs = {
496
      source: source_project.try(:hook_attrs),
K
Kirill Zaitsev 已提交
497
      target: target_project.hook_attrs,
498
      last_commit: nil,
499 500 501 502
      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 已提交
503 504
    }

505
    if diff_head_commit
D
Douwe Maan 已提交
506
      attrs[:last_commit] = diff_head_commit.hook_attrs
K
Kirill Zaitsev 已提交
507 508 509 510 511
    end

    attributes.merge!(attrs)
  end

I
Izaak Alpert 已提交
512 513 514 515
  def for_fork?
    target_project != source_project
  end

516 517 518 519
  def project
    target_project
  end

520 521 522 523
  # 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.
524
  # This optimization does not apply to issues from external sources.
525
  def cache_merge_request_closes_issues!(current_user)
526 527
    return if project.has_external_issue_tracker?

528
    transaction do
529
      self.merge_requests_closing_issues.delete_all
530

531
      closes_issues(current_user).each do |issue|
532
        self.merge_requests_closing_issues.create!(issue: issue)
533 534 535 536
      end
    end
  end

537
  # Return the set of issues that will be closed if this merge request is accepted.
538
  def closes_issues(current_user = self.author)
539
    if target_branch == project.default_branch
540
      messages = [title, description]
541
      messages.concat(commits.map(&:safe_message)) if merge_request_diff
542 543 544

      Gitlab::ClosingIssueExtractor.new(project, current_user).
        closed_by_message(messages.join("\n"))
545 546 547 548 549
    else
      []
    end
  end

550
  def issues_mentioned_but_not_closing(current_user)
551
    return [] unless target_branch == project.default_branch
552

553
    ext = Gitlab::ReferenceExtractor.new(project, current_user)
554
    ext.analyze("#{title}\n#{description}")
555

556
    ext.issues - closes_issues(current_user)
557 558
  end

559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574
  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

575 576
  def source_project_namespace
    if source_project && source_project.namespace
577
      source_project.namespace.full_path
578 579 580 581 582
    else
      "(removed)"
    end
  end

583 584
  def target_project_namespace
    if target_project && target_project.namespace
585
      target_project.namespace.full_path
586 587 588 589 590
    else
      "(removed)"
    end
  end

591 592 593 594 595 596 597 598 599 600 601 602
  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

603
  def merge_commit_message(include_description: false)
604 605 606 607
    closes_issues_references = closes_issues.map do |issue|
      issue.to_reference(target_project)
    end

608 609 610 611
    message = [
      "Merge branch '#{source_branch}' into '#{target_branch}'",
      title
    ]
612

613
    if !include_description && closes_issues_references.present?
614
      message << "Closes #{closes_issues_references.to_sentence}"
615 616
    end

617
    message << "#{description}" if include_description && description.present?
618 619
    message << "See merge request #{to_reference}"

620
    message.join("\n\n")
621
  end
622

J
James Lopez 已提交
623 624
  def reset_merge_when_pipeline_succeeds
    return unless merge_when_pipeline_succeeds?
625

J
James Lopez 已提交
626
    self.merge_when_pipeline_succeeds = false
Z
Zeger-Jan van de Weg 已提交
627
    self.merge_user = nil
628 629 630 631
    if merge_params
      merge_params.delete('should_remove_source_branch')
      merge_params.delete('commit_message')
    end
Z
Zeger-Jan van de Weg 已提交
632 633 634 635

    self.save
  end

636
  # Return array of possible target branches
S
Steven Burgart 已提交
637
  # depends on target project of MR
638 639 640 641 642 643 644 645 646
  def target_branches
    if target_project.nil?
      []
    else
      target_project.repository.branch_names
    end
  end

  # Return array of possible source branches
S
Steven Burgart 已提交
647
  # depends on source project of MR
648 649 650 651 652 653 654
  def source_branches
    if source_project.nil?
      []
    else
      source_project.repository.branch_names
    end
  end
655 656

  def locked_long_ago?
B
Ben Bodenmiller 已提交
657 658 659
    return false unless locked?

    locked_at.nil? || locked_at < (Time.now - 1.day)
660
  end
661 662

  def has_ci?
663 664 665 666
    has_ci_integration = source_project.try(:ci_service)
    uses_gitlab_ci = all_pipelines.any?

    (has_ci_integration || uses_gitlab_ci) && commits.any?
667 668 669 670 671
  end

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

673
  def broken?
674
    has_no_commits? || branch_missing? || cannot_be_merged?
675 676
  end

677
  def can_be_merged_by?(user)
678 679 680 681 682 683 684
    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)
685 686
  end

687
  def mergeable_ci_state?
J
James Lopez 已提交
688
    return true unless project.only_allow_merge_if_pipeline_succeeds?
689

690
    !head_pipeline || head_pipeline.success? || head_pipeline.skipped?
691 692
  end

D
Douwe Maan 已提交
693
  def environments_for(current_user)
694
    return [] unless diff_head_commit
695

D
Douwe Maan 已提交
696 697 698
    @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
699

D
Douwe Maan 已提交
700 701 702 703
      if source_project
        envs.concat EnvironmentsFinder.new(source_project, current_user,
          ref: source_branch, commit: diff_head_commit).execute
      end
704

D
Douwe Maan 已提交
705
      h[current_user] = envs.uniq
706
    end
D
Douwe Maan 已提交
707 708

    @environments[current_user]
709 710
  end

711 712 713 714 715 716 717 718 719
  def state_human_name
    if merged?
      "Merged"
    elsif closed?
      "Closed"
    else
      "Open"
    end
  end
720

721 722 723 724 725 726 727 728 729 730
  def state_icon_name
    if merged?
      "check"
    elsif closed?
      "times"
    else
      "circle-o"
    end
  end

731 732 733 734
  def fetch_ref
    target_project.repository.fetch_ref(
      source_project.repository.path_to_repo,
      "refs/heads/#{source_branch}",
735
      ref_path
736 737 738
    )
  end

739 740 741 742
  def ref_path
    "refs/merge-requests/#{iid}/head"
  end

743 744
  def ref_fetched?
    project.repository.ref_exists?(ref_path)
745 746 747
  end

  def ensure_ref_fetched
748
    fetch_ref unless ref_fetched?
749 750
  end

751 752 753 754 755 756 757 758
  def in_locked_state
    begin
      lock_mr
      yield
    ensure
      unlock_mr if locked?
    end
  end
759

760 761 762
  def diverged_commits_count
    cache = Rails.cache.read(:"merge_request_#{id}_diverged_commits")

763
    if cache.blank? || cache[:source_sha] != source_branch_sha || cache[:target_sha] != target_branch_sha
764
      cache = {
765 766
        source_sha: source_branch_sha,
        target_sha: target_branch_sha,
767 768 769 770 771 772 773 774 775
        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
776
    return 0 unless source_branch_sha && target_branch_sha
777

778
    Gitlab::Git::Commit.between(target_project.repository.raw_repository, source_branch_sha, target_branch_sha).size
779
  end
780
  private :compute_diverged_commits_count
781 782 783 784 785

  def diverged_from_target_branch?
    diverged_commits_count > 0
  end

786
  def head_pipeline
787
    return unless diff_head_sha && source_project
788

789
    @head_pipeline ||= source_project.pipeline_for(source_branch, diff_head_sha)
790
  end
791

792
  def all_pipelines
793
    return Ci::Pipeline.none unless source_project
794

795
    @all_pipelines ||= source_project.pipelines
796 797
      .where(sha: all_commits_sha, ref: source_branch)
      .order(id: :desc)
798
  end
799

800
  # Note that this could also return SHA from now dangling commits
801
  #
802
  def all_commits_sha
803 804
    if persisted?
      merge_request_diffs.flat_map(&:commits_sha).uniq
805 806
    elsif compare_commits
      compare_commits.to_a.reverse.map(&:id)
807
    else
808
      [diff_head_sha]
809
    end
810 811
  end

812 813 814 815
  def merge_commit
    @merge_commit ||= project.commit(merge_commit_sha) if merge_commit_sha
  end

816
  def can_be_reverted?(current_user)
817
    merge_commit && !merge_commit.has_been_reverted?(current_user, self)
818
  end
819 820 821 822

  def can_be_cherry_picked?
    merge_commit
  end
823

824
  def has_complete_diff_refs?
825
    diff_sha_refs && diff_sha_refs.complete?
826 827
  end

828
  def update_diff_notes_positions(old_diff_refs:, new_diff_refs:)
829
    return unless has_complete_diff_refs?
830 831
    return if new_diff_refs == old_diff_refs

832 833
    active_diff_notes = self.notes.new_diff_notes.select do |note|
      note.active?(old_diff_refs)
834 835 836 837 838 839 840 841 842 843 844 845 846 847
    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 已提交
848 849 850 851 852
    transaction do
      active_diff_notes.each do |note|
        service.execute(note)
        Gitlab::Timeless.timeless(note, &:save)
      end
853 854 855
    end
  end

856 857 858
  def keep_around_commit
    project.repository.keep_around(self.merge_commit_sha)
  end
859 860 861 862 863

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

864 865 866 867 868
  def conflicts_can_be_resolved_by?(user)
    access = ::Gitlab::UserAccess.new(user, project: source_project)
    access.can_push_to_branch?(source_branch)
  end

869 870 871 872 873
  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?
874 875

    begin
876 877 878 879 880
      # 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
881
    rescue Rugged::OdbError, Gitlab::Conflict::Parser::UnresolvableError, Gitlab::Conflict::FileCollection::ConflictSideMissing
882
      @conflicts_can_be_resolved_in_ui = false
883 884
    end
  end
885 886

  def has_commits?
887
    merge_request_diff && commits_count > 0
888 889 890 891 892
  end

  def has_no_commits?
    !has_commits?
  end
893 894 895 896 897 898 899 900 901 902 903 904

  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 已提交
905
end