Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump devise from 3.5.10 to 4.7.1 #42

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump devise from 3.5.10 to 4.7.1 #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ gem 'turbolinks', '~> 2.5'
gem 'puma', '~> 3.2'

# Stuff for my app
gem 'devise', '~> 3.5'
gem 'devise', '~> 4.7'
gem 'devise-bootstrap-views', '~> 0.0'
gem 'cancancan', '~> 1.11'
gem 'rolify', '~> 5.1'
Expand Down
39 changes: 19 additions & 20 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ GEM
autoprefixer-rails (8.6.3)
execjs
backports (3.11.3)
bcrypt (3.1.12)
bcrypt (3.1.13)
bootstrap-datepicker-rails (1.8.0.1)
railties (>= 3.0)
bootstrap-sass (3.3.7)
Expand Down Expand Up @@ -73,8 +73,8 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
crass (1.0.4)
concurrent-ruby (1.1.5)
crass (1.0.5)
cucumber (3.1.1)
builder (>= 2.1.2)
cucumber-core (~> 3.1.0)
Expand All @@ -99,12 +99,11 @@ GEM
cucumber-wire (0.0.1)
database_cleaner (1.7.0)
debug_inspector (0.0.3)
devise (3.5.10)
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)
devise-bootstrap-views (0.0.11)
diff-lcs (1.3)
Expand Down Expand Up @@ -154,7 +153,7 @@ GEM
launchy (2.4.3)
addressable (~> 2.3)
libv8 (3.16.14.19)
loofah (2.2.2)
loofah (2.3.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
Expand All @@ -163,17 +162,17 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
mini_portile2 (2.4.0)
minitest (5.12.2)
multi_json (1.13.1)
multi_test (0.1.2)
nokogiri (1.8.3)
mini_portile2 (~> 2.3.0)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
orm_adapter (0.5.0)
pg (0.21.0)
public_suffix (3.0.2)
puma (3.11.4)
rack (1.6.10)
rack (1.6.11)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.10)
Expand All @@ -193,8 +192,8 @@ GEM
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
rails-reveal-js (3.3.0)
railties (~> 4, < 5.1)
rails_12factor (0.0.3)
Expand All @@ -207,15 +206,15 @@ GEM
activesupport (= 4.2.10)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.3.1)
rake (13.0.0)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
redcarpet (3.4.0)
ref (2.0.0)
responders (2.4.0)
actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
responders (2.4.1)
actionpack (>= 4.2.0, < 6.0)
railties (>= 4.2.0, < 6.0)
rolify (5.2.0)
rspec-core (3.7.1)
rspec-support (~> 3.7.0)
Expand Down Expand Up @@ -262,7 +261,7 @@ GEM
therubyracer (0.12.3)
libv8 (~> 3.16.14.15)
ref
thor (0.20.0)
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.8)
turbolinks (2.5.4)
Expand Down Expand Up @@ -296,7 +295,7 @@ DEPENDENCIES
coffee-rails (~> 4.1)
cucumber-rails
database_cleaner
devise (~> 3.5)
devise (~> 4.7)
devise-bootstrap-views (~> 0.0)
dotenv-rails
factory_girl_rails
Expand Down