2011-11-28 07:39:43 +00:00
|
|
|
class MergeRequest < ActiveRecord::Base
|
|
|
|
belongs_to :project
|
|
|
|
belongs_to :author, :class_name => "User"
|
|
|
|
belongs_to :assignee, :class_name => "User"
|
2011-12-18 10:10:20 +00:00
|
|
|
has_many :notes, :as => :noteable, :dependent => :destroy
|
2011-11-28 07:39:43 +00:00
|
|
|
|
|
|
|
attr_protected :author, :author_id, :project, :project_id
|
|
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
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)}
|
|
|
|
|
|
|
|
def new?
|
|
|
|
today? && created_at == updated_at
|
|
|
|
end
|
2011-11-29 18:06:37 +00:00
|
|
|
|
|
|
|
def diffs
|
|
|
|
commits = project.repo.commits_between(target_branch, source_branch).map {|c| Commit.new(c)}
|
2011-12-20 06:24:14 +00:00
|
|
|
diffs = project.repo.diff(commits.first.prev_commit.id, commits.last.id) rescue []
|
2011-11-29 18:06:37 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
def last_commit
|
|
|
|
project.commit(source_branch)
|
|
|
|
end
|
2011-11-28 07:39:43 +00:00
|
|
|
end
|
2011-12-18 14:09:16 +00: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
|
|
|
|
#
|
|
|
|
|