| ... | @@ -10,47 +10,15 @@ class MergeRequest < ActiveRecord::Base |
... | @@ -10,47 +10,15 @@ class MergeRequest < ActiveRecord::Base |
|
|
CAN_BE_MERGED = 2
|
|
CAN_BE_MERGED = 2
|
|
|
CANNOT_BE_MERGED = 3
|
|
CANNOT_BE_MERGED = 3
|
|
|
|
|
|
|
|
belongs_to :project
|
|
|
|
|
belongs_to :author, :class_name => "User"
|
|
|
|
|
belongs_to :assignee, :class_name => "User"
|
|
|
|
|
has_many :notes, :as => :noteable, :dependent => :destroy
|
|
|
|
|
|
|
|
|
|
serialize :st_commits
|
|
serialize :st_commits
|
|
|
serialize :st_diffs
|
|
serialize :st_diffs
|
|
|
|
|
|
|
|
attr_protected :author, :author_id, :project, :project_id
|
|
attr_accessor :should_remove_source_branch
|
|
|
attr_accessor :author_id_of_changes,
|
|
|
|
|
:should_remove_source_branch
|
|
|
|
|
|
|
|
|
|
validates_presence_of :project_id
|
|
|
|
|
validates_presence_of :author_id
|
|
|
|
|
validates_presence_of :source_branch
|
|
validates_presence_of :source_branch
|
|
|
validates_presence_of :target_branch
|
|
validates_presence_of :target_branch
|
|
|
validate :validate_branches
|
|
validate :validate_branches
|
|
|
|
|
|
|
|
delegate :name,
|
|
|
|
|
:email,
|
|
|
|
|
:to => :author,
|
|
|
|
|
:prefix => true
|
|
|
|
|
|
|
|
|
|
delegate :name,
|
|
|
|
|
:email,
|
|
|
|
|
:to => :assignee,
|
|
|
|
|
:allow_nil => true,
|
|
|
|
|
: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 self.search query
|
|
|
|
|
where("title like :query", :query => "%#{query}%")
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def self.find_all_by_branch(branch_name)
|
|
def self.find_all_by_branch(branch_name)
|
|
|
where("source_branch like :branch or target_branch like :branch", :branch => branch_name)
|
|
where("source_branch like :branch or target_branch like :branch", :branch => branch_name)
|
|
|
end
|
|
end
|
| ... | @@ -96,14 +64,6 @@ class MergeRequest < ActiveRecord::Base |
... | @@ -96,14 +64,6 @@ class MergeRequest < ActiveRecord::Base |
|
|
self.save
|
|
self.save
|
|
|
end
|
|
end
|
|
|
|
|
|
|
|
def today?
|
|
|
|
|
Date.today == created_at.to_date
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def new?
|
|
|
|
|
today? && created_at == updated_at
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def diffs
|
|
def diffs
|
|
|
st_diffs || []
|
|
st_diffs || []
|
|
|
end
|
|
end
|
| ... | |
... | |
| ... | | ... | |