Skip to content
This repository has been archived by the owner on Nov 10, 2019. It is now read-only.

Bump devise from 3.5.6 to 4.7.1 #16

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ source 'https://rubygems.org'

gem 'rails', '4.2.5.1'
gem 'mysql2', '~> 0.3.15'
gem 'devise', '~> 3.1'
gem 'devise', '~> 4.7'
gem 'haml', '~> 4.0.4'
gem 'sass', '~> 3'
gem 'coderay', '~> 1.1.0'
Expand Down
53 changes: 28 additions & 25 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ GEM
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
arel (6.0.3)
bcrypt (3.1.10)
bcrypt (3.1.13)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.2)
builder (3.2.3)
byebug (8.2.2)
codeclimate-test-reporter (0.4.8)
simplecov (>= 0.7.1, < 1.0.0)
Expand All @@ -50,14 +50,14 @@ GEM
execjs
coffee-script-source (1.10.0)
concurrent-ruby (1.0.0)
crass (1.0.4)
database_cleaner (1.2.0)
debug_inspector (0.0.2)
devise (3.5.6)
devise (4.7.1)
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.2.5)
docile (1.1.5)
Expand Down Expand Up @@ -91,7 +91,8 @@ GEM
haml-coderay (0.2.0)
coderay
haml
i18n (0.7.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jquery-rails (4.1.0)
rails-dom-testing (~> 1.0)
railties (>= 4.2.0)
Expand All @@ -100,19 +101,20 @@ GEM
listen (3.0.5)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
loofah (2.0.3)
loofah (2.2.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.10)
mail (2.6.3)
mime-types (>= 1.16, < 3)
method_source (0.8.2)
mime-types (2.99)
mini_portile2 (2.0.0)
minitest (5.8.4)
mini_portile2 (2.4.0)
minitest (5.11.3)
mysql2 (0.3.20)
nenv (0.2.0)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
notiffany (0.0.8)
nenv (~> 0.1)
shellany (~> 0.0)
Expand All @@ -122,7 +124,7 @@ GEM
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
rack (1.6.4)
rack (1.6.11)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.5.1)
Expand All @@ -138,23 +140,24 @@ GEM
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-dom-testing (1.0.9)
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails-html-sanitizer (1.2.0)
loofah (~> 2.2, >= 2.2.2)
railties (4.2.5.1)
actionpack (= 4.2.5.1)
activesupport (= 4.2.5.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.5.0)
rake (12.3.3)
rb-fsevent (0.9.7)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
responders (2.1.1)
railties (>= 4.2.0, < 5.1)
responders (2.4.1)
actionpack (>= 4.2.0, < 6.0)
railties (>= 4.2.0, < 6.0)
rspec (3.4.0)
rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0)
Expand Down Expand Up @@ -192,12 +195,12 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
thor (0.19.1)
thread_safe (0.3.5)
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.2)
tzinfo (1.2.2)
tzinfo (1.2.5)
thread_safe (~> 0.1)
warden (1.2.6)
warden (1.2.7)
rack (>= 1.0)
web-console (2.3.0)
activemodel (>= 4.0)
Expand All @@ -214,7 +217,7 @@ DEPENDENCIES
coderay (~> 1.1.0)
coffee-script
database_cleaner (~> 1.2.0)
devise (~> 3.1)
devise (~> 4.7)
factory_girl_rails
guard-rspec
haml (~> 4.0.4)
Expand Down