Update devise
This commit is contained in:
parent
031d539e88
commit
b243a54ce5
2 changed files with 4 additions and 5 deletions
2
Gemfile
2
Gemfile
|
@ -68,7 +68,7 @@ gem 'bootstrap-will_paginate', '0.0.10'
|
|||
gem 'paperclip', '>= 5.2.0'
|
||||
|
||||
# Use devise for users and admins
|
||||
gem 'devise', '3.5.6'
|
||||
gem "devise", ">= 4.6.0"
|
||||
gem 'omniauth-oauth2', '1.3.1'
|
||||
|
||||
# Use cancancan for authorization
|
||||
|
|
|
@ -103,12 +103,11 @@ GEM
|
|||
delayed_job_active_record (4.1.4)
|
||||
activerecord (>= 3.0, < 6.1)
|
||||
delayed_job (>= 3.0, < 5)
|
||||
devise (3.5.6)
|
||||
devise (4.7.0)
|
||||
bcrypt (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
railties (>= 3.2.6, < 5)
|
||||
railties (>= 4.1.0)
|
||||
responders
|
||||
thread_safe (~> 0.1)
|
||||
warden (~> 1.2.3)
|
||||
diff-lcs (1.3)
|
||||
docile (1.1.5)
|
||||
|
@ -324,7 +323,7 @@ DEPENDENCIES
|
|||
daemons (= 1.2.3)
|
||||
delayed_job (~> 4.0)
|
||||
delayed_job_active_record
|
||||
devise (= 3.5.6)
|
||||
devise (>= 4.6.0)
|
||||
factory_girl_rails (= 4.6.0)
|
||||
faker (= 1.4.2)
|
||||
friendly_id (~> 5.1.0)
|
||||
|
|
Loading…
Reference in a new issue