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

Update display of merge requests and issues to also show downvotes

Browse source
This commit is contained in:
Riyad Preukschas 2012-09-08 03:30:41 +02:00
parent 7b0c7ae52c
commit 1271b4ce66
5 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/merge_requests/_merge_request.html.haml
View file

@ -25,3 +25,5 @@
ago
- if merge_request.upvotes > 0
%span.badge.badge-success= "+#{merge_request.upvotes}"
- if merge_request.downvotes > 0
%span.badge.badge-important= "-#{merge_request.downvotes}"

6
app/views/merge_requests/show/_mr_title.html.haml
View file

@ -24,8 +24,10 @@
Edit
%br
- if @merge_request.upvotes > 0
.upvotes#upvotes= "+#{pluralize @merge_request.upvotes, 'upvote'}"
.votes#votes
Votes:
.upvotes#upvotes= "#{@merge_request.upvotes} up"
.downvotes#downvotes= "#{@merge_request.downvotes} down"
.back_link