aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorLuc Donnet2014-08-20 11:26:15 +0200
committerLuc Donnet2014-08-20 11:26:15 +0200
commitbf8c646de5b0a908ba89a2f0ce40c29407feb79a (patch)
treee8e8921582ce74232a1f14b612b210e3ff631de4 /app/models/user.rb
parent3bc81cb294d1453326d6e8fc86183ba651c5307c (diff)
parent32b0c11f377205168e4006efa46e31303a0e0cf5 (diff)
downloadchouette-core-bf8c646de5b0a908ba89a2f0ce40c29407feb79a.tar.bz2
Merge branch 'sismo' of github.com:afimb/chouette2 into sismo
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 1b9ec7416..ae6cceeee 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -17,6 +17,7 @@ class User < ActiveRecord::Base
before_validation(:on => :create) do
self.password ||= Devise.friendly_token.first(6)
+ self.password_confirmation ||= self.password
end
# remove organisation and referentials if last user of it