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

Added 'x notes' and +1 counters to issues and merge requests. Refs #549

Browse source
This commit is contained in:
Ariejan de Vroom 2012-03-15 00:51:03 +02:00
parent 8d8b82127f
commit 2d00f2dfe4
6 changed files with 52 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/models/merge_request.rb
View file

@ -34,7 +34,7 @@ class MergeRequest < ActiveRecord::Base
def validate_branches
if target_branch == source_branch
if target_branch == source_branch
errors.add :base, "You can not use same branch for source and target branches"
end
end
@ -51,6 +51,11 @@ class MergeRequest < ActiveRecord::Base
def last_commit
project.commit(source_branch)
end
# Return the number of +1 comments (upvotes)
def upvotes
notes.select(&:upvote?).size
end
end
# == Schema Information
#