developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/publication' into desktop

Browse Source 
* remotes/origin/publication:
  new desktop framework updates
This commit is contained in:
Rueshyna committed 2013-01-07 12:44:30 +08:00
2 parents 8381941d51 37f8c1637a
commit 35e0011111
12 files changed
+180 -256
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/models/user/user.rb
+1 -1
View File
@@ -3,7 +3,7 @@ class User
include Mongoid::Document
include Mongoid::Timestamps
devise :database_authenticatable, :recoverable, :rememberable, :trackable, :registerable, :validatable, :timeoutable
devise :database_authenticatable, :recoverable, :rememberable, :trackable, :registerable, :validatable #, :timeoutable
mount_uploader :avatar, AvatarUploader