Merge branch 'bootstrap'

Conflicts:
	Gemfile
	app/views/commits/_commits.html.haml
	app/views/projects/empty.html.haml
This commit is contained in:
Dmitriy Zaporozhets 2012-01-30 00:45:35 +02:00
commit 8ebfae9a07
127 changed files with 2464 additions and 2991 deletions

View file

@ -1,4 +1,6 @@
class Commit
include ActiveModel::Conversion
extend ActiveModel::Naming
attr_accessor :commit
attr_accessor :head
@ -18,6 +20,10 @@ class Commit
:id,
:to => :commit
def persisted?
false
end
def initialize(raw_commit, head = nil)
@commit = raw_commit
@head = head