Skip to content

Commit

Permalink
Merge pull request #465 from wearefine/462-devise-version
Browse files Browse the repository at this point in the history
fixes #462 - bump devise to latest version
  • Loading branch information
jamesmk authored Apr 11, 2019
2 parents 1398cfb + 1b0fa52 commit e8708c0
Show file tree
Hide file tree
Showing 5 changed files with 73 additions and 73 deletions.
36 changes: 18 additions & 18 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ PATH
acts_as_list (~> 0.9.11)
browser (~> 2.5.3)
carrierwave (~> 1.2.2)
devise (~> 4.4.3)
devise (~> 4.6.2)
jquery-rails (~> 4.3.1)
jquery-ui-rails (~> 6.0.1)
judge (~> 3.0.0)
Expand Down Expand Up @@ -72,7 +72,7 @@ GEM
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
acts_as_list (0.9.11)
acts_as_list (0.9.19)
activerecord (>= 3.0)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
Expand All @@ -83,7 +83,7 @@ GEM
rake
thor (>= 0.14.0)
arel (9.0.0)
bcrypt (3.1.11)
bcrypt (3.1.12)
better_errors (2.4.0)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
Expand Down Expand Up @@ -116,7 +116,7 @@ GEM
capybara-webkit (1.11.1)
capybara (>= 2.3.0, < 2.8.0)
json
carrierwave (1.2.2)
carrierwave (1.2.3)
activemodel (>= 4.0.0)
activesupport (>= 4.0.0)
mime-types (>= 1.16)
Expand All @@ -128,7 +128,7 @@ GEM
daemons (1.2.6)
database_cleaner (1.6.2)
debug_inspector (0.0.3)
devise (4.4.3)
devise (4.6.2)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 6.0)
Expand Down Expand Up @@ -206,7 +206,7 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mimemagic (0.3.2)
mini_magick (4.8.0)
mini_magick (4.9.3)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
Expand Down Expand Up @@ -263,10 +263,10 @@ GEM
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
remotipart (1.4.0)
responders (2.4.0)
actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
remotipart (1.4.2)
responders (2.4.1)
actionpack (>= 4.2.0, < 6.0)
railties (>= 4.2.0, < 6.0)
rspec (3.6.0)
rspec-core (~> 3.6.0)
rspec-expectations (~> 3.6.0)
Expand Down Expand Up @@ -310,12 +310,12 @@ GEM
shellany (0.0.1)
shoulda-matchers (3.1.2)
activesupport (>= 4.0.0)
simple_form (4.0.0)
actionpack (> 4)
activemodel (> 4)
slim (3.0.9)
simple_form (4.0.1)
actionpack (>= 5.0)
activemodel (>= 5.0)
slim (4.0.1)
temple (>= 0.7.6, < 0.9)
tilt (>= 1.3.3, < 2.1)
tilt (>= 2.0.6, < 2.1)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
Expand All @@ -326,17 +326,17 @@ GEM
sshkit (1.16.0)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
temple (0.8.0)
temple (0.8.1)
thin (1.7.2)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
thor (0.20.0)
thread_safe (0.3.6)
tilt (2.0.8)
tilt (2.0.9)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.9)
uglifier (4.1.20)
execjs (>= 0.3.0, < 3)
warden (1.2.7)
rack (>= 1.0)
Expand Down
2 changes: 1 addition & 1 deletion fae.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Gem::Specification.new do |s|
s.add_dependency 'acts_as_list', '~> 0.9.11'
s.add_dependency 'browser', '~> 2.5.3'
s.add_dependency 'carrierwave', '~> 1.2.2'
s.add_dependency 'devise', '~> 4.4.3'
s.add_dependency 'devise', '~> 4.6.2'
s.add_dependency 'jquery-ui-rails', '~> 6.0.1'
s.add_dependency 'mini_magick'
s.add_dependency 'judge', '~> 3.0.0'
Expand Down
36 changes: 18 additions & 18 deletions gemfiles/rails_5_0.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ PATH
acts_as_list (~> 0.9.11)
browser (~> 2.5.3)
carrierwave (~> 1.2.2)
devise (~> 4.4.3)
devise (~> 4.6.2)
jquery-rails (~> 4.3.1)
jquery-ui-rails (~> 6.0.1)
judge (~> 3.0.0)
Expand Down Expand Up @@ -68,7 +68,7 @@ GEM
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
acts_as_list (0.9.11)
acts_as_list (0.9.19)
activerecord (>= 3.0)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
Expand All @@ -79,7 +79,7 @@ GEM
rake
thor (>= 0.14.0)
arel (8.0.0)
bcrypt (3.1.11)
bcrypt (3.1.12)
better_errors (2.4.0)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
Expand Down Expand Up @@ -112,7 +112,7 @@ GEM
capybara-webkit (1.11.1)
capybara (>= 2.3.0, < 2.8.0)
json
carrierwave (1.2.2)
carrierwave (1.2.3)
activemodel (>= 4.0.0)
activesupport (>= 4.0.0)
mime-types (>= 1.16)
Expand All @@ -124,7 +124,7 @@ GEM
daemons (1.2.6)
database_cleaner (1.6.2)
debug_inspector (0.0.3)
devise (4.4.3)
devise (4.6.2)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 6.0)
Expand Down Expand Up @@ -199,7 +199,7 @@ GEM
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_magick (4.8.0)
mini_magick (4.9.3)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
Expand Down Expand Up @@ -255,10 +255,10 @@ GEM
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
remotipart (1.4.0)
responders (2.4.0)
actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
remotipart (1.4.2)
responders (2.4.1)
actionpack (>= 4.2.0, < 6.0)
railties (>= 4.2.0, < 6.0)
rspec (3.6.0)
rspec-core (~> 3.6.0)
rspec-expectations (~> 3.6.0)
Expand Down Expand Up @@ -302,12 +302,12 @@ GEM
shellany (0.0.1)
shoulda-matchers (3.1.2)
activesupport (>= 4.0.0)
simple_form (4.0.0)
actionpack (> 4)
activemodel (> 4)
slim (3.0.9)
simple_form (4.0.1)
actionpack (>= 5.0)
activemodel (>= 5.0)
slim (4.0.1)
temple (>= 0.7.6, < 0.9)
tilt (>= 1.3.3, < 2.1)
tilt (>= 2.0.6, < 2.1)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
Expand All @@ -318,17 +318,17 @@ GEM
sshkit (1.16.0)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
temple (0.8.0)
temple (0.8.1)
thin (1.7.2)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
thor (0.20.0)
thread_safe (0.3.6)
tilt (2.0.8)
tilt (2.0.9)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.9)
uglifier (4.1.20)
execjs (>= 0.3.0, < 3)
warden (1.2.7)
rack (>= 1.0)
Expand Down
36 changes: 18 additions & 18 deletions gemfiles/rails_5_1.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ PATH
acts_as_list (~> 0.9.11)
browser (~> 2.5.3)
carrierwave (~> 1.2.2)
devise (~> 4.4.3)
devise (~> 4.6.2)
jquery-rails (~> 4.3.1)
jquery-ui-rails (~> 6.0.1)
judge (~> 3.0.0)
Expand Down Expand Up @@ -68,7 +68,7 @@ GEM
i18n (~> 0.7)
minitest (~> 5.1)
tzinfo (~> 1.1)
acts_as_list (0.9.11)
acts_as_list (0.9.19)
activerecord (>= 3.0)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
Expand All @@ -79,7 +79,7 @@ GEM
rake
thor (>= 0.14.0)
arel (8.0.0)
bcrypt (3.1.11)
bcrypt (3.1.12)
better_errors (2.4.0)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
Expand Down Expand Up @@ -112,7 +112,7 @@ GEM
capybara-webkit (1.11.1)
capybara (>= 2.3.0, < 2.8.0)
json
carrierwave (1.2.2)
carrierwave (1.2.3)
activemodel (>= 4.0.0)
activesupport (>= 4.0.0)
mime-types (>= 1.16)
Expand All @@ -124,7 +124,7 @@ GEM
daemons (1.2.6)
database_cleaner (1.6.2)
debug_inspector (0.0.3)
devise (4.4.3)
devise (4.6.2)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 6.0)
Expand Down Expand Up @@ -199,7 +199,7 @@ GEM
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_magick (4.8.0)
mini_magick (4.9.3)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.1)
Expand Down Expand Up @@ -255,10 +255,10 @@ GEM
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
remotipart (1.4.0)
responders (2.4.0)
actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
remotipart (1.4.2)
responders (2.4.1)
actionpack (>= 4.2.0, < 6.0)
railties (>= 4.2.0, < 6.0)
rspec (3.6.0)
rspec-core (~> 3.6.0)
rspec-expectations (~> 3.6.0)
Expand Down Expand Up @@ -302,12 +302,12 @@ GEM
shellany (0.0.1)
shoulda-matchers (3.1.2)
activesupport (>= 4.0.0)
simple_form (4.0.0)
actionpack (> 4)
activemodel (> 4)
slim (3.0.9)
simple_form (4.0.1)
actionpack (>= 5.0)
activemodel (>= 5.0)
slim (4.0.1)
temple (>= 0.7.6, < 0.9)
tilt (>= 1.3.3, < 2.1)
tilt (>= 2.0.6, < 2.1)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
Expand All @@ -318,17 +318,17 @@ GEM
sshkit (1.15.1)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
temple (0.8.0)
temple (0.8.1)
thin (1.7.2)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
thor (0.20.0)
thread_safe (0.3.6)
tilt (2.0.8)
tilt (2.0.9)
tzinfo (1.2.4)
thread_safe (~> 0.1)
uglifier (4.1.9)
uglifier (4.1.20)
execjs (>= 0.3.0, < 3)
warden (1.2.7)
rack (>= 1.0)
Expand Down
Loading

0 comments on commit e8708c0

Please sign in to comment.