update devise gem
This commit is contained in:
parent
00ae65b108
commit
ed9543ff5d
|
@ -128,7 +128,7 @@ GEM
|
|||
daemons (1.1.9)
|
||||
database_cleaner (0.9.1)
|
||||
debug_inspector (0.0.2)
|
||||
devise (2.1.2)
|
||||
devise (2.1.3)
|
||||
bcrypt-ruby (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
railties (~> 3.1)
|
||||
|
@ -219,7 +219,7 @@ GEM
|
|||
multi_json (~> 1.0)
|
||||
multi_xml
|
||||
httpauth (0.2.0)
|
||||
i18n (0.6.1)
|
||||
i18n (0.6.4)
|
||||
journey (1.0.4)
|
||||
jquery-atwho-rails (0.1.7)
|
||||
jquery-rails (2.1.3)
|
||||
|
@ -343,7 +343,7 @@ GEM
|
|||
rb-fsevent (0.9.2)
|
||||
rb-inotify (0.8.8)
|
||||
ffi (>= 0.5.0)
|
||||
rdoc (3.12.1)
|
||||
rdoc (3.12.2)
|
||||
json (~> 1.4)
|
||||
redcarpet (2.2.2)
|
||||
redis (3.0.2)
|
||||
|
@ -428,7 +428,7 @@ GEM
|
|||
eventmachine (>= 0.12.6)
|
||||
rack (>= 1.0.0)
|
||||
thor (0.17.0)
|
||||
tilt (1.3.3)
|
||||
tilt (1.3.4)
|
||||
timers (1.1.0)
|
||||
treetop (1.4.12)
|
||||
polyglot
|
||||
|
|
|
@ -99,7 +99,7 @@ Devise.setup do |config|
|
|||
|
||||
# ==> Configuration for :validatable
|
||||
# Range for password length. Default is 6..128.
|
||||
# config.password_length = 6..128
|
||||
config.password_length = 6..128
|
||||
|
||||
# Email regex used to validate email formats. It simply asserts that
|
||||
# an one (and only one) @ exists in the given string. This is mainly
|
||||
|
|
|
@ -17,6 +17,7 @@ en:
|
|||
unauthenticated: 'You need to sign in before continuing.'
|
||||
unconfirmed: 'You have to confirm your account before continuing.'
|
||||
locked: 'Your account is locked.'
|
||||
not_found_in_database: 'Invalid email or password.'
|
||||
invalid: 'Invalid email or password.'
|
||||
invalid_token: 'Invalid authentication token.'
|
||||
timeout: 'Your session expired, please sign in again to continue.'
|
||||
|
|
Loading…
Reference in a new issue