deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Models Refactoring: Move methods to roles

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-06-07 15:44:57 +03:00
parent 98b8416647
commit 0a70aca3b1
20 changed files with 531 additions and 524 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/models/merge_request.rb
View file

@ -1,6 +1,8 @@
require File.join(Rails.root, "app/models/commit")
class MergeRequest < ActiveRecord::Base
include Upvote
UNCHECKED = 1
CAN_BE_MERGED = 2
CANNOT_BE_MERGED = 3
@ -128,12 +130,6 @@ class MergeRequest < ActiveRecord::Base
self.project.events.where(:target_id => self.id, :target_type => "MergeRequest", :action => Event::Closed).last
end
# Return the number of +1 comments (upvotes)
def upvotes
notes.select(&:upvote?).size
end
def commits
st_commits || []
end