Merge pull request #4371 from MrZYX/bump_devise

Update devise

Gemfile

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

Gemfile.lock

@@ -91,11 +91,11 @@ GEM
       nokogiri (>= 1.5.0)
       rails (~> 3.0)
     database_cleaner (1.1.0)
-    devise (2.1.3)
+    devise (3.0.2)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (~> 3.1)
-      warden (~> 1.2.1)
+      railties (>= 3.2.6, < 5)
+      warden (~> 1.2.3)
     diff-lcs (1.2.4)
     erubis (2.7.0)
     ethon (0.5.12)
@@ -440,7 +440,7 @@ DEPENDENCIES
   configurate (= 0.0.8)
   cucumber-rails (= 1.3.1)
   database_cleaner (= 1.1.0)
-  devise (= 2.1.3)
+  devise (= 3.0.2)
   factory_girl_rails (= 4.2.1)
   faraday (= 0.8.8)
   faraday_middleware (= 0.9.0)

config/initializers/devise.rb

@@ -58,7 +58,7 @@ Devise.setup do |config|
 
   # Setup a pepper to generate the encrypted password.
   config.pepper = "065eb8798b181ff0ea2c5c16aee0ff8b70e04e2ee6bd6e08b49da46924223e39127d5335e466207d42bf2a045c12be5f90e92012a4f05f7fc6d9f3c875f4c95b"
-  
+
   config.reset_password_within = 2.days
 
   # ==> Configuration for :invitable
@@ -78,10 +78,10 @@ Devise.setup do |config|
   # ==> Configuration for :rememberable
   # The time the user will be remembered without asking for credentials again.
   config.remember_for = 2.weeks
-  
+
   # ==> 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
@@ -159,7 +159,7 @@ Devise.setup do |config|
   #   end
   #   manager.default_strategies(:scope => :user).unshift :twitter_oauth
   # end
-  
+
   # Sign out via a DELETE request
   config.sign_out_via = :delete
 end

config/locales/devise/devise.en.yml

@@ -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.'
@@ -40,7 +41,7 @@ en:
       send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'
       confirmed: 'Your account was successfully confirmed. You are now signed in.'
       new:
-        resend_confirmation: "Resend confirmation instructions" 
+        resend_confirmation: "Resend confirmation instructions"
     registrations:
       signed_up: 'You have signed up successfully. If enabled, a confirmation was sent to your e-mail.'
       updated: 'You updated your account successfully.'