Merge pull request #966 from consul/update-devise

Updates devise gem
2016-03-04 16:40:37 +01:00
parent 23d7ea1f02 3e36efffb6
commit 29eda7f14c
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@@ -19,7 +19,7 @@ gem 'jquery-ui-rails'
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
 gem 'turbolinks'

-gem 'devise'
+gem 'devise', '~> 3.5.6'
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
 gem 'omniauth'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -443,7 +443,7 @@ DEPENDENCIES
  dalli
  database_cleaner
  delayed_job_active_record (~> 4.1.0)
-  devise
+  devise (~> 3.5.6)
  devise-async
  email_spec
  factory_girl_rails