gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #758 from ChrisBr/update_devise

Browse source 
Update devise to 3.5.4
This commit is contained in:
Christian Bruckmayer 2016-01-21 20:15:18 +01:00
commit 7f2728e619
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Gemfile.lock
View file

@ -68,7 +68,7 @@ GEM
axlsx_rails (0.2.0) axlsx_rails (0.2.0)
axlsx (>= 2.0.1) axlsx (>= 2.0.1)
rails (>= 3.1) rails (>= 3.1)
bcrypt (3.1.7) bcrypt (3.1.10)
bootstrap-sass (3.3.4.1) bootstrap-sass (3.3.4.1)
autoprefixer-rails (>= 5.0.0.1) autoprefixer-rails (>= 5.0.0.1)
sass (>= 3.2.19) sass (>= 3.2.19)
@ -129,10 +129,11 @@ GEM
delayed_job_active_record (4.0.1) delayed_job_active_record (4.0.1)
activerecord (>= 3.0, < 4.2) activerecord (>= 3.0, < 4.2)
delayed_job (>= 3.0, < 4.1) delayed_job (>= 3.0, < 4.1)
devise (3.2.4) devise (3.5.4)
bcrypt (~> 3.0) bcrypt (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5) railties (>= 3.2.6, < 5)
responders
thread_safe (~> 0.1) thread_safe (~> 0.1)
warden (~> 1.2.3) warden (~> 1.2.3)
devise_ichain_authenticatable (0.3.1) devise_ichain_authenticatable (0.3.1)
@ -319,7 +320,7 @@ GEM
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rainbow (2.0.0) rainbow (2.0.0)
rake (10.4.2) rake (10.5.0)
rb-fsevent (0.9.4) rb-fsevent (0.9.4)
rb-inotify (0.9.4) rb-inotify (0.9.4)
ffi (>= 0.5.0) ffi (>= 0.5.0)
@ -333,6 +334,8 @@ GEM
redcarpet (3.2.3) redcarpet (3.2.3)
referer-parser (0.2.1) referer-parser (0.2.1)
request_store (1.0.6) request_store (1.0.6)
responders (1.1.2)
railties (>= 3.2, < 4.2)
rest-client (1.7.3) rest-client (1.7.3)
mime-types (>= 1.16, < 3.0) mime-types (>= 1.16, < 3.0)
netrc (~> 0.7) netrc (~> 0.7)
@ -416,7 +419,7 @@ GEM
json (>= 1.8.0) json (>= 1.8.0)
user_agent_parser (2.1.5) user_agent_parser (2.1.5)
uuidtools (2.1.4) uuidtools (2.1.4)
warden (1.2.3) warden (1.2.4)
rack (>= 1.0) rack (>= 1.0)
websocket-driver (0.3.3) websocket-driver (0.3.3)
whenever (0.9.2) whenever (0.9.2)
@ -499,3 +502,6 @@ DEPENDENCIES
turbolinks turbolinks
uglifier (>= 1.3.0) uglifier (>= 1.3.0)
whenever whenever
BUNDLED WITH
1.10.6