consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #966 from consul/update-devise

Browse Source 
Updates devise gem
This commit is contained in:
Juanjo Bazán
2016-03-04 16:40:37 +01:00
parent 23d7ea1f02 3e36efffb6
commit 29eda7f14c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -19,7 +19,7 @@ gem 'jquery-ui-rails'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks' gem 'turbolinks'
gem 'devise' gem 'devise', '~> 3.5.6'
# Use ActiveModel has_secure_password # Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7' # gem 'bcrypt', '~> 3.1.7'
gem 'omniauth' gem 'omniauth'

2
Gemfile.lock
View File

@@ -443,7 +443,7 @@ DEPENDENCIES
dalli dalli
database_cleaner database_cleaner
delayed_job_active_record (~> 4.1.0) delayed_job_active_record (~> 4.1.0)
devise devise (~> 3.5.6)
devise-async devise-async
email_spec email_spec
factory_girl_rails factory_girl_rails