update devise to 2.2.4

This commit is contained in:
Jonne Haß 2013-08-08 15:40:46 +02:00
parent ff4a66ca5c
commit 769bc5ce90
4 changed files with 9 additions and 8 deletions

View file

@ -13,7 +13,7 @@ gem 'json', '1.8.0'
# Authentication
gem 'devise', '2.1.3'
gem 'devise', '2.2.4'
# Background processing

View file

@ -91,7 +91,7 @@ GEM
nokogiri (>= 1.5.0)
rails (~> 3.0)
database_cleaner (1.1.0)
devise (2.1.3)
devise (2.2.4)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
railties (~> 3.1)
@ -440,7 +440,7 @@ DEPENDENCIES
configurate (= 0.0.8)
cucumber-rails (= 1.3.1)
database_cleaner (= 1.1.0)
devise (= 2.1.3)
devise (= 2.2.4)
factory_girl_rails (= 4.2.1)
faraday (= 0.8.8)
faraday_middleware (= 0.9.0)

View file

@ -81,7 +81,7 @@ Devise.setup do |config|
# ==> Configuration for :validatable
# Range for password length
# config.password_length = 6..20
# config.password_length = 8..20
# Regex to use to validate the email address
# config.email_regexp = /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i

View file

@ -10,6 +10,7 @@ en:
unauthenticated: 'You need to sign in or sign up 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 username or password.'
invalid_token: 'Invalid authentication token.'
timeout: 'Your session expired, please sign in again to continue.'