merge_request.rb 4.3 KB
Newer Older
1 2
require File.join(Rails.root, "app/models/commit")

D
Dmitriy Zaporozhets 已提交
3
class MergeRequest < ActiveRecord::Base
4 5 6 7
  UNCHECKED = 1
  CAN_BE_MERGED = 2
  CANNOT_BE_MERGED = 3

D
Dmitriy Zaporozhets 已提交
8 9 10
  belongs_to :project
  belongs_to :author, :class_name => "User"
  belongs_to :assignee, :class_name => "User"
11
  has_many :notes, :as => :noteable, :dependent => :destroy
D
Dmitriy Zaporozhets 已提交
12

13 14 15
  serialize :st_commits
  serialize :st_diffs

D
Dmitriy Zaporozhets 已提交
16
  attr_protected :author, :author_id, :project, :project_id
17
  attr_accessor :author_id_of_changes
D
Dmitriy Zaporozhets 已提交
18 19 20 21 22 23

  validates_presence_of :project_id
  validates_presence_of :assignee_id
  validates_presence_of :author_id
  validates_presence_of :source_branch
  validates_presence_of :target_branch
24
  validate :validate_branches
D
Dmitriy Zaporozhets 已提交
25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43

  delegate :name,
           :email,
           :to => :author,
           :prefix => true

  delegate :name,
           :email,
           :to => :assignee,
           :prefix => true

  validates :title,
            :presence => true,
            :length   => { :within => 0..255 }

  scope :opened, where(:closed => false)
  scope :closed, where(:closed => true)
  scope :assigned, lambda { |u| where(:assignee_id => u.id)}

44 45 46 47
  def self.search query
    where("title like :query", :query => "%#{query}%")
  end

48 49 50 51
  def self.find_all_by_branch(branch_name)
    where("source_branch like :branch or target_branch like :branch", :branch => branch_name)
  end

52
  def validate_branches
53
    if target_branch == source_branch
54 55 56 57
      errors.add :base, "You can not use same branch for source and target branches"
    end
  end

58 59 60 61 62
  def reload_code
    self.reloaded_commits
    self.reloaded_diffs
  end

63 64 65 66
  def unchecked?
    state == UNCHECKED
  end

67 68 69 70
  def mark_as_unchecked
    self.update_attributes(:state => UNCHECKED)
  end

71
  def can_be_merged?
72 73 74 75
    state == CAN_BE_MERGED
  end

  def check_if_can_be_merged
D
Dmitriy Zaporozhets 已提交
76
    self.state = if GitlabMerge.new(self, self.author).can_be_merged?
77 78 79 80 81
                   CAN_BE_MERGED
                 else
                   CANNOT_BE_MERGED
                 end
    self.save
82 83
  end

D
Dmitriy Zaporozhets 已提交
84 85 86
  def new?
    today? && created_at == updated_at
  end
D
Dmitriy Zaporozhets 已提交
87 88

  def diffs
89 90 91 92 93 94 95 96 97 98 99 100
    st_diffs || []
  end

  def reloaded_diffs
    if open? && unmerged_diffs.any?
      self.st_diffs = unmerged_diffs
      save
    end
    diffs
  end

  def unmerged_diffs
D
Dmitriy Zaporozhets 已提交
101
    commits = project.repo.commits_between(target_branch, source_branch).map {|c| Commit.new(c)}
102
    diffs = project.repo.diff(commits.first.prev_commit.id, commits.last.id) rescue []
D
Dmitriy Zaporozhets 已提交
103 104 105
  end

  def last_commit
106
    commits.first
D
Dmitriy Zaporozhets 已提交
107
  end
108

109 110 111 112
  def merged? 
    merged && merge_event
  end

D
Dmitriy Zaporozhets 已提交
113 114 115 116
  def merge_event
    self.project.events.where(:target_id => self.id, :target_type => "MergeRequest", :action => Event::Merged).last
  end

117 118 119 120 121
  def closed_event
    self.project.events.where(:target_id => self.id, :target_type => "MergeRequest", :action => Event::Closed).last
  end


122 123 124 125
  # Return the number of +1 comments (upvotes)
  def upvotes
    notes.select(&:upvote?).size
  end
126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143

  def commits
    st_commits || []
  end

  def probably_merged?
    unmerged_commits.empty? && 
      commits.any? && open?
  end

  def open?
    !closed
  end

  def mark_as_merged!
    self.merged = true
    self.closed = true
    save
144 145 146
  end

  def mark_as_unmergable
D
Dmitriy Zaporozhets 已提交
147
    self.update_attributes :state => CANNOT_BE_MERGED
148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164
  end

  def reloaded_commits 
    if open? && unmerged_commits.any? 
      self.st_commits = unmerged_commits
      save
    end
    commits
  end

  def unmerged_commits
    self.project.repo.
      commits_between(self.target_branch, self.source_branch).
      map {|c| Commit.new(c)}.
      sort_by(&:created_at).
      reverse
  end
165 166 167 168 169 170 171 172 173 174 175

  def merge!(user_id)
    self.mark_as_merged!
    Event.create(
      :project => self.project,
      :action => Event::Merged,
      :target_id => self.id,
      :target_type => "MergeRequest",
      :author_id => user_id
    )
  end
176

177
  def automerge!(current_user)
D
Dmitriy Zaporozhets 已提交
178
    if GitlabMerge.new(self, current_user).merge
179 180 181 182 183 184 185
      self.merge!(current_user.id)
      true
    end
  rescue 
    self.mark_as_unmergable
    false
  end
D
Dmitriy Zaporozhets 已提交
186
end
V
Valery Sizov 已提交
187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202
# == Schema Information
#
# Table name: merge_requests
#
#  id            :integer         not null, primary key
#  target_branch :string(255)     not null
#  source_branch :string(255)     not null
#  project_id    :integer         not null
#  author_id     :integer
#  assignee_id   :integer
#  title         :string(255)
#  closed        :boolean         default(FALSE), not null
#  created_at    :datetime
#  updated_at    :datetime
#