Download as
Browse Code »

Commit ed9543ff5d84b2087febc539b84f091a8ddea4c0

Authored by Dmitriy Zaporozhets
1 parent 00ae65b1
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

update devise gem

Showing 3 changed files with 6 additions and 5 deletions   Show diff stats
Gemfile.lock
  Diff comments   View file @ed9543f
... ... @@ -128,7 +128,7 @@ GEM
128 128 daemons (1.1.9)
129 129 database_cleaner (0.9.1)
130 130 debug_inspector (0.0.2)
131   - devise (2.1.2)
  131 + devise (2.1.3)
132 132 bcrypt-ruby (~> 3.0)
133 133 orm_adapter (~> 0.1)
134 134 railties (~> 3.1)
... ... @@ -219,7 +219,7 @@ GEM
219 219 multi_json (~> 1.0)
220 220 multi_xml
221 221 httpauth (0.2.0)
222   - i18n (0.6.1)
  222 + i18n (0.6.4)
223 223 journey (1.0.4)
224 224 jquery-atwho-rails (0.1.7)
225 225 jquery-rails (2.1.3)
... ... @@ -343,7 +343,7 @@ GEM
343 343 rb-fsevent (0.9.2)
344 344 rb-inotify (0.8.8)
345 345 ffi (>= 0.5.0)
346   - rdoc (3.12.1)
  346 + rdoc (3.12.2)
347 347 json (~> 1.4)
348 348 redcarpet (2.2.2)
349 349 redis (3.0.2)
... ... @@ -428,7 +428,7 @@ GEM
428 428 eventmachine (>= 0.12.6)
429 429 rack (>= 1.0.0)
430 430 thor (0.17.0)
431   - tilt (1.3.3)
  431 + tilt (1.3.4)
432 432 timers (1.1.0)
433 433 treetop (1.4.12)
434 434 polyglot
... ...
config/initializers/devise.rb
  Diff comments   View file @ed9543f
... ... @@ -99,7 +99,7 @@ Devise.setup do |config|
99 99  
100 100 # ==> Configuration for :validatable
101 101 # Range for password length. Default is 6..128.
102   - # config.password_length = 6..128
  102 + config.password_length = 6..128
103 103  
104 104 # Email regex used to validate email formats. It simply asserts that
105 105 # an one (and only one) @ exists in the given string. This is mainly
... ...
config/locales/devise.en.yml
  Diff comments   View file @ed9543f
... ... @@ -17,6 +17,7 @@ en:
17 17 unauthenticated: 'You need to sign in before continuing.'
18 18 unconfirmed: 'You have to confirm your account before continuing.'
19 19 locked: 'Your account is locked.'
  20 + not_found_in_database: 'Invalid email or password.'
20 21 invalid: 'Invalid email or password.'
21 22 invalid_token: 'Invalid authentication token.'
22 23 timeout: 'Your session expired, please sign in again to continue.'
... ...