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

Merge branch 'sys_hooks' of dev.gitlabhq.com:gitlabhq

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-07-20 09:08:16 +00:00
commit 3c6daec4b1
33 changed files with 425 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/models/user.rb
View file

@ -1,4 +1,5 @@
class User < ActiveRecord::Base
include Account
devise :database_authenticatable, :token_authenticatable, :lockable,