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

Merge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-state-machine

Browse source 
Conflicts:
	app/models/issue.rb
	app/models/merge_request.rb
This commit is contained in:
Dmitriy Zaporozhets 2013-02-19 11:01:19 +02:00
commit 155703c613
55 changed files with 521 additions and 428 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/issues_helper.rb
View file

@ -6,7 +6,7 @@ module IssuesHelper
def issue_css_classes issue
classes = "issue"
classes << " closed" if issue.closed
classes << " closed" if issue.closed?
classes << " today" if issue.today?
classes
end

2
app/helpers/merge_requests_helper.rb
View file

@ -12,7 +12,7 @@ module MergeRequestsHelper
def mr_css_classes mr
classes = "merge_request"
classes << " closed" if mr.closed
classes << " closed" if mr.closed?
classes << " merged" if mr.merged?
classes
end