From ed9543ff5d84b2087febc539b84f091a8ddea4c0 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 28 Feb 2013 21:06:16 +0200
Subject: [PATCH] update devise gem
---
Gemfile.lock | 8 ++++----
config/initializers/devise.rb | 2 +-
config/locales/devise.en.yml | 1 +
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index 76f1c214c5e51..91f3790b83bbe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -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
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 97946c54b40da..9c3976335ff6e 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -99,7 +99,7 @@
# ==> 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
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
index 3b763cf410de7..275273a0b1271 100644
--- a/config/locales/devise.en.yml
+++ b/config/locales/devise.en.yml
@@ -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.'
--
GitLab