merge_request.rb 9.5 KB
Newer Older
D
Dmitriy Zaporozhets 已提交
1 2 3 4
# == Schema Information
#
# Table name: merge_requests
#
D
Dmitriy Zaporozhets 已提交
5 6 7 8 9 10 11
#  id                :integer          not null, primary key
#  target_branch     :string(255)      not null
#  source_branch     :string(255)      not null
#  source_project_id :integer          not null
#  author_id         :integer
#  assignee_id       :integer
#  title             :string(255)
D
Dmitriy Zaporozhets 已提交
12 13
#  created_at        :datetime
#  updated_at        :datetime
D
Dmitriy Zaporozhets 已提交
14 15 16 17 18
#  milestone_id      :integer
#  state             :string(255)
#  merge_status      :string(255)
#  target_project_id :integer          not null
#  iid               :integer
D
Dmitriy Zaporozhets 已提交
19
#  description       :text
D
Dmitriy Zaporozhets 已提交
20
#  position          :integer          default(0)
D
Dmitriy Zaporozhets 已提交
21
#
D
Dmitriy Zaporozhets 已提交
22

23
require Rails.root.join("app/models/commit")
24
require Rails.root.join("lib/static_model")
25

D
Dmitriy Zaporozhets 已提交
26
class MergeRequest < ActiveRecord::Base
27
  include Issuable
28
  include Taskable
29
  include InternalId
30

31 32
  belongs_to :target_project, foreign_key: :target_project_id, class_name: "Project"
  belongs_to :source_project, foreign_key: :source_project_id, class_name: "Project"
33

34
  has_one :merge_request_diff, dependent: :destroy
D
Dmitriy Zaporozhets 已提交
35

36
  after_create :create_merge_request_diff
D
Dmitriy Zaporozhets 已提交
37
  after_update :update_merge_request_diff
38 39

  delegate :commits, :diffs, :last_commit, :last_commit_short_sha, to: :merge_request_diff, prefix: nil
I
Izaak Alpert 已提交
40

A
Andrey Kumanyaev 已提交
41 42
  attr_accessor :should_remove_source_branch

D
Dmitriy Zaporozhets 已提交
43 44 45 46
  # 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 已提交
47 48
  # Temporary fields to store compare vars
  # when creating new merge request
D
Dmitriy Zaporozhets 已提交
49
  attr_accessor :can_be_created, :compare_failed,
50
    :compare_commits, :compare_diffs
D
Dmitriy Zaporozhets 已提交
51

A
Andrew8xx8 已提交
52
  state_machine :state, initial: :opened do
A
Andrew8xx8 已提交
53 54 55 56 57
    event :close do
      transition [:reopened, :opened] => :closed
    end

    event :merge do
D
Dmitriy Zaporozhets 已提交
58
      transition [:reopened, :opened, :locked] => :merged
A
Andrew8xx8 已提交
59 60 61
    end

    event :reopen do
A
Andrew8xx8 已提交
62
      transition closed: :reopened
A
Andrew8xx8 已提交
63 64
    end

65
    event :lock_mr do
D
Dmitriy Zaporozhets 已提交
66 67 68
      transition [:reopened, :opened] => :locked
    end

69
    event :unlock_mr do
D
Dmitriy Zaporozhets 已提交
70 71 72
      transition locked: :reopened
    end

A
Andrew8xx8 已提交
73 74 75 76
    state :opened
    state :reopened
    state :closed
    state :merged
D
Dmitriy Zaporozhets 已提交
77
    state :locked
A
Andrew8xx8 已提交
78 79
  end

80 81 82 83 84 85 86 87 88 89 90 91 92
  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
      transition unchecked: :can_be_merged
    end

    event :mark_as_unmergeable do
      transition unchecked: :cannot_be_merged
    end

93
    state :unchecked
94 95 96
    state :can_be_merged
    state :cannot_be_merged
  end
97

D
Dmitriy Zaporozhets 已提交
98
  validates :source_project, presence: true, unless: :allow_broken
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
I
Izaak Alpert 已提交
102
  validate :validate_branches
103
  validate :validate_fork
D
Dmitriy Zaporozhets 已提交
104

105 106
  scope :of_group, ->(group) { where("source_project_id in (:group_project_ids) OR target_project_id in (:group_project_ids)", group_project_ids: group.project_ids) }
  scope :of_user_team, ->(team) { where("(source_project_id in (:team_project_ids) OR target_project_id in (:team_project_ids) AND assignee_id in (:team_member_ids))", team_project_ids: team.project_ids, team_member_ids: team.member_ids) }
A
Andrew8xx8 已提交
107
  scope :merged, -> { with_state(:merged) }
I
Izaak Alpert 已提交
108
  scope :by_branch, ->(branch_name) { where("(source_branch LIKE :branch) OR (target_branch LIKE :branch)", branch: branch_name) }
A
Andrew8xx8 已提交
109
  scope :cared, ->(user) { where('assignee_id = :user OR author_id = :user', user: user.id) }
110
  scope :by_milestone, ->(milestone) { where(milestone_id: milestone) }
I
Izaak Alpert 已提交
111
  scope :in_projects, ->(project_ids) { where("source_project_id in (:project_ids) OR target_project_id in (:project_ids)", project_ids: project_ids) }
112
  scope :of_projects, ->(ids) { where(target_project_id: ids) }
113 114 115
  # Closed scope for merge request should return
  # both merged and closed mr's
  scope :closed, -> { with_states(:closed, :merged) }
116
  scope :declined, -> { with_states(:closed) }
117

118
  def validate_branches
119
    if target_project == source_project && target_branch == source_branch
I
Izaak Alpert 已提交
120
      errors.add :branch_conflict, "You can not use same project/branch for source and target"
121
    end
122

123
    if opened? || reopened?
I
Izaak Alpert 已提交
124
      similar_mrs = self.target_project.merge_requests.where(source_branch: source_branch, target_branch: target_branch, source_project_id: source_project.id).opened
125 126
      similar_mrs = similar_mrs.where('id not in (?)', self.id) if self.id
      if similar_mrs.any?
J
jubianchi 已提交
127 128 129 130
        errors.add :validate_branches,
                   "Cannot Create: This merge request already exists: #{
                   similar_mrs.pluck(:title)
                   }"
131
      end
132
    end
133 134
  end

135
  def validate_fork
136 137 138
    return true unless target_project && source_project

    if target_project == source_project
139 140 141 142 143 144 145
      true
    else
      # If source and target projects are different
      # we should check if source project is actually a fork of target project
      if source_project.forked_from?(target_project)
        true
      else
J
jubianchi 已提交
146 147
        errors.add :validate_fork,
                   'Source project is not a fork of target project'
148 149 150 151
      end
    end
  end

D
Dmitriy Zaporozhets 已提交
152 153 154 155 156 157 158
  def update_merge_request_diff
    if source_branch_changed? || target_branch_changed?
      reload_code
      mark_as_unchecked
    end
  end

159
  def reload_code
160
    if merge_request_diff && open?
161 162
      merge_request_diff.reload_content
    end
163 164
  end

165
  def check_if_can_be_merged
166 167 168 169 170
    if Gitlab::Satellite::MergeAction.new(self.author, self).can_be_merged?
      mark_as_mergeable
    else
      mark_as_unmergeable
    end
171 172
  end

D
Dmitriy Zaporozhets 已提交
173
  def merge_event
I
Izaak Alpert 已提交
174
    self.target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::MERGED).last
D
Dmitriy Zaporozhets 已提交
175 176
  end

177
  def closed_event
I
Izaak Alpert 已提交
178
    self.target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::CLOSED).last
179 180
  end

D
Dmitriy Zaporozhets 已提交
181
  def automerge!(current_user, commit_message = nil)
D
Dmitriy Zaporozhets 已提交
182
    MergeRequests::AutoMergeService.new.execute(self, current_user, commit_message)
183
  end
R
randx 已提交
184

185 186 187 188
  def open?
    opened? || reopened?
  end

189
  def mr_and_commit_notes
190 191 192 193
    # Fetch comments only from last 100 commits
    commits_for_notes_limit = 100
    commit_ids = commits.last(commits_for_notes_limit).map(&:id)

194 195 196 197 198
    project.notes.where(
      "(noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR (noteable_type = 'Commit' AND commit_id IN (:commit_ids))",
      mr_id: id,
      commit_ids: commit_ids
    )
199
  end
200

201 202 203
  # Returns the raw diff for this merge request
  #
  # see "git diff"
I
Izaak Alpert 已提交
204 205
  def to_diff(current_user)
    Gitlab::Satellite::MergeAction.new(current_user, self).diff_in_satellite
206 207 208 209 210
  end

  # Returns the commit as a series of email patches.
  #
  # see "git format-patch"
I
Izaak Alpert 已提交
211 212
  def to_patch(current_user)
    Gitlab::Satellite::MergeAction.new(current_user, self).format_patch
213
  end
214

K
Kirill Zaitsev 已提交
215 216 217 218 219 220 221 222 223 224 225 226 227 228
  def hook_attrs
    attrs = {
      source: source_project.hook_attrs,
      target: target_project.hook_attrs,
      last_commit: nil
    }

    unless last_commit.nil?
      attrs.merge!(last_commit: last_commit.hook_attrs(source_project))
    end

    attributes.merge!(attrs)
  end

I
Izaak Alpert 已提交
229 230 231 232
  def for_fork?
    target_project != source_project
  end

233 234 235 236
  def project
    target_project
  end

237 238 239
  # Return the set of issues that will be closed if this merge request is accepted.
  def closes_issues
    if target_branch == project.default_branch
240 241 242
      issues = commits.flat_map { |c| c.closes_issues(project) }
      issues += Gitlab::ClosingIssueExtractor.closed_by_message_in_project(description, project)
      issues.uniq.sort_by(&:id)
243 244 245 246 247 248 249 250 251 252
    else
      []
    end
  end

  # Mentionable override.
  def gfm_reference
    "merge request !#{iid}"
  end

253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268
  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

269 270 271 272 273 274 275 276
  def source_project_namespace
    if source_project && source_project.namespace
      source_project.namespace.path
    else
      "(removed)"
    end
  end

277 278 279 280 281 282 283 284
  def target_project_namespace
    if target_project && target_project.namespace
      target_project.namespace.path
    else
      "(removed)"
    end
  end

285 286 287 288 289 290 291 292 293 294 295 296
  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 已提交
297 298 299 300 301 302 303 304 305
  # 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
306
    Event.reset_event_cache_for(self)
D
Drew Blessing 已提交
307 308
  end

309 310 311
  def merge_commit_message
    message = "Merge branch '#{source_branch}' into '#{target_branch}'"
    message << "\n\n"
D
Dmitriy Zaporozhets 已提交
312
    message << title.to_s
313
    message << "\n\n"
D
Dmitriy Zaporozhets 已提交
314
    message << description.to_s
315 316
    message << "\n\n"
    message << "See merge request !#{iid}"
D
Dmitriy Zaporozhets 已提交
317
    message
318
  end
319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338

  # Return array of possible target branches
  # dependes on target project of MR
  def target_branches
    if target_project.nil?
      []
    else
      target_project.repository.branch_names
    end
  end

  # Return array of possible source branches
  # dependes on source project of MR
  def source_branches
    if source_project.nil?
      []
    else
      source_project.repository.branch_names
    end
  end
D
Dmitriy Zaporozhets 已提交
339
end