Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2

1 files changed, 9 insertions, 0 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
new file mode 100644
index 000000000..b2f7c8ec9
--- /dev/null
+++ b/app/models/user.rb
@@ -0,0 +1,9 @@
+class User < ActiveRecord::Base
+  # Include default devise modules. Others available are:
+  # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
+  devise :database_authenticatable, :registerable,
+         :recoverable, :rememberable, :trackable, :validatable
+
+  # Setup accessible (or protected) attributes for your model
+  attr_accessible :email, :password, :password_confirmation, :remember_me
+end