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.

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 #48

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 @@ -24,7 +24,7 @@ gem 'ruby-progressbar', '~> 1.7', '>= 1.7.5'
gem 'rubyzip', '~> 1.2.1'

# authentication
gem 'devise', '~> 3.5.4', require: %w(devise devise/orm/active_record)
gem 'devise', '~> 4.7.1', require: %w(devise devise/orm/active_record)

# search with elastic search
gem 'elasticsearch-dsl', '~> 0.1.5'
Expand Down
35 changes: 17 additions & 18 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ GEM
execjs (~> 2.0)
backport_new_renderer (1.0.0)
rails
bcrypt (3.1.11)
bcrypt (3.1.13)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bitly (1.1.0)
Expand All @@ -91,7 +91,7 @@ GEM
autoprefixer-rails (>= 5.0.0.1)
sass (>= 3.3.0)
brakeman (4.2.1)
builder (3.2.3)
builder (3.2.4)
bullet (5.7.3)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11.0)
Expand Down Expand Up @@ -132,24 +132,23 @@ GEM
coffee-script-source (1.12.2)
combine_pdf (1.0.5)
ruby-rc4 (>= 0.1.5)
concurrent-ruby (1.0.5)
concurrent-ruby (1.1.6)
connection_pool (2.2.1)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.3)
crass (1.0.6)
daemons (1.2.6)
database_cleaner (1.4.1)
debug_inspector (0.0.2)
declarative (0.0.9)
declarative-option (0.1.0)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
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)
diff-lcs (1.3)
docile (1.1.5)
Expand Down Expand Up @@ -306,7 +305,7 @@ GEM
logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
loofah (2.2.2)
loofah (2.4.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.9)
Expand All @@ -326,7 +325,7 @@ GEM
mime-types (2.99.3)
mini_magick (4.8.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
minitest (5.14.0)
mono_logger (1.1.0)
multi_json (1.13.1)
multi_xml (0.6.0)
Expand Down Expand Up @@ -394,7 +393,7 @@ GEM
puma (3.4.0)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.10)
rack (1.6.13)
rack-livereload (0.3.16)
rack
rack-mini-profiler (0.10.7)
Expand Down Expand Up @@ -435,15 +434,15 @@ 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)
railties (4.2.7.1)
actionpack (= 4.2.7.1)
activesupport (= 4.2.7.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (3.0.0)
rake (12.3.1)
rake (13.0.1)
ransack (1.7.0)
actionpack (>= 3.0)
activerecord (>= 3.0)
Expand Down Expand Up @@ -471,9 +470,9 @@ GEM
declarative (< 0.1.0)
declarative-option (< 0.2.0)
uber (< 0.2.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)
resque (1.27.4)
mono_logger (~> 1.0)
multi_json (~> 1.0)
Expand Down Expand Up @@ -588,7 +587,7 @@ GEM
turbolinks (5.1.0)
turbolinks-source (~> 5.1)
turbolinks-source (5.1.0)
tzinfo (1.2.5)
tzinfo (1.2.6)
thread_safe (~> 0.1)
uber (0.1.0)
uglifier (3.0.4)
Expand Down Expand Up @@ -659,7 +658,7 @@ DEPENDENCIES
combine_pdf (~> 1.0.5)
daemons (~> 1.2, >= 1.2.3)
database_cleaner (~> 1.4)
devise (~> 3.5.4)
devise (~> 4.7.1)
dotenv-rails (~> 2.2, >= 2.2.1)
elasticsearch-dsl (~> 0.1.5)
elasticsearch-model (~> 5.0, >= 5.0.1)
Expand Down