gitlabhq/app/models/merge_request.rb

213 lines
4.5 KiB
Ruby
Raw Normal View History

require File.join(Rails.root, "app/models/commit")
2011-11-28 08:39:43 +01:00
class MergeRequest < ActiveRecord::Base
include Upvote
UNCHECKED = 1
CAN_BE_MERGED = 2
CANNOT_BE_MERGED = 3
2011-11-28 08:39:43 +01:00
belongs_to :project
belongs_to :author, :class_name => "User"
belongs_to :assignee, :class_name => "User"
has_many :notes, :as => :noteable, :dependent => :destroy
2011-11-28 08:39:43 +01:00
serialize :st_commits
serialize :st_diffs
2011-11-28 08:39:43 +01:00
attr_protected :author, :author_id, :project, :project_id
attr_accessor :author_id_of_changes,
:should_remove_source_branch
2011-11-28 08:39:43 +01:00
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
validate :validate_branches
2011-11-28 08:39:43 +01:00
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)}
2012-03-16 00:14:39 +01:00
def self.search query
where("title like :query", :query => "%#{query}%")
end
def self.find_all_by_branch(branch_name)
where("source_branch like :branch or target_branch like :branch", :branch => branch_name)
end
2012-04-16 21:08:03 +02:00
def human_state
states = {
CAN_BE_MERGED => "can_be_merged",
CANNOT_BE_MERGED => "cannot_be_merged",
UNCHECKED => "unchecked"
}
states[self.state]
end
def validate_branches
if target_branch == source_branch
errors.add :base, "You can not use same branch for source and target branches"
end
end
def reload_code
self.reloaded_commits
self.reloaded_diffs
end
def unchecked?
state == UNCHECKED
end
def mark_as_unchecked
self.update_attributes(:state => UNCHECKED)
end
2012-03-29 23:27:42 +02:00
def can_be_merged?
state == CAN_BE_MERGED
end
def check_if_can_be_merged
self.state = if Gitlab::Merge.new(self, self.author).can_be_merged?
CAN_BE_MERGED
else
CANNOT_BE_MERGED
end
self.save
2012-03-29 23:27:42 +02:00
end
2012-06-21 07:29:53 +02:00
def today?
Date.today == created_at.to_date
end
2011-11-28 08:39:43 +01:00
def new?
today? && created_at == updated_at
end
2011-11-29 19:06:37 +01:00
def diffs
st_diffs || []
end
def reloaded_diffs
if open? && unmerged_diffs.any?
self.st_diffs = unmerged_diffs
save
end
diffs
end
def unmerged_diffs
2011-11-29 19:06:37 +01:00
commits = project.repo.commits_between(target_branch, source_branch).map {|c| Commit.new(c)}
diffs = project.repo.diff(commits.first.prev_commit.id, commits.last.id) rescue []
2011-11-29 19:06:37 +01:00
end
def last_commit
commits.first
2011-11-29 19:06:37 +01:00
end
def merged?
merged && merge_event
end
2012-03-15 22:32:00 +01:00
def merge_event
self.project.events.where(:target_id => self.id, :target_type => "MergeRequest", :action => Event::Merged).last
end
def closed_event
self.project.events.where(:target_id => self.id, :target_type => "MergeRequest", :action => Event::Closed).last
end
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
2012-03-29 23:27:42 +02:00
end
def mark_as_unmergable
2012-03-31 12:48:30 +02:00
self.update_attributes :state => CANNOT_BE_MERGED
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
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
def automerge!(current_user)
if Gitlab::Merge.new(self, current_user).merge
self.merge!(current_user.id)
true
end
2012-06-04 23:08:41 +02:00
rescue
self.mark_as_unmergable
false
end
2011-11-28 08:39:43 +01:00
end
2011-12-18 15:09:16 +01:00
# == 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
#