diff --git a/Gemfile b/Gemfile index 2d71ad85..4558a065 100644 --- a/Gemfile +++ b/Gemfile @@ -20,7 +20,7 @@ gem 'curb' gem 'customerio' gem 'devise_invitable', '~> 1.3' gem 'devise-i18n' -gem 'devise', '~> 3.1' +gem 'devise', '~> 4.7' gem 'doorkeeper' gem 'elasticsearch-model' gem 'faraday', '~> 0.9.0' diff --git a/Gemfile.lock b/Gemfile.lock index f2a41c99..da53670b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -81,14 +81,14 @@ GEM json (~> 1.4) nokogiri (>= 1.4.4) uuidtools (~> 2.1) - bcrypt (3.1.9) + bcrypt (3.1.13) bourbon (3.1.8) sass (>= 3.2.0) thor bugsnag (1.8.4) httparty (>= 0.6, < 1.0) multi_json (~> 1.0) - builder (3.2.2) + builder (3.2.3) byebug (2.7.0) columnize (~> 0.3) debugger-linecache (~> 1.2) @@ -113,12 +113,14 @@ GEM coderay (1.1.0) coffee-script-source (1.8.0) columnize (0.8.9) + concurrent-ruby (1.1.5) confyio (1.2.0) faraday (>= 0.9.0) json (>= 1.7.7) connection_pool (2.1.1) crack (0.4.2) safe_yaml (~> 1.0.0) + crass (1.0.5) css_parser (1.3.5) addressable curb (0.8.6) @@ -126,12 +128,11 @@ GEM httparty (>= 0.5, < 1.0) database_cleaner (1.2.0) debugger-linecache (1.2.0) - devise (3.4.1) + 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-i18n (0.10.3) devise_invitable (1.3.3) @@ -181,18 +182,20 @@ GEM json (~> 1.8) multi_xml (>= 0.5.2) httpclient (2.3.4.1) - i18n (0.7.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jasmine-core (2.0.0) jquery-rails (3.1.0) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.2) + json (1.8.6) json_spec (1.1.4) multi_json (~> 1.0) rspec (>= 2.0, < 4.0) jwt (0.1.11) multi_json (>= 1.5) - loofah (2.0.1) + loofah (2.3.1) + crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.6.3) mime-types (>= 1.16, < 3) @@ -201,14 +204,14 @@ GEM mime-types (1.25.1) mini_magick (3.7.0) subexec (~> 0.2.1) - mini_portile (0.6.2) - minitest (5.5.1) + mini_portile2 (2.4.0) + minitest (5.12.0) multi_json (1.10.1) multi_xml (0.5.5) multipart-post (2.0.0) newrelic_rpm (3.6.8.168) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) + nokogiri (1.9.1) + mini_portile2 (~> 2.4.0) oauth2 (0.9.3) faraday (>= 0.8, < 0.10) jwt (~> 0.1.8) @@ -247,7 +250,7 @@ GEM signature (~> 0.1.6) quiet_assets (1.0.2) railties (>= 3.1, < 5.0) - rack (1.6.0) + rack (1.6.11) rack-protection (1.5.2) rack rack-test (0.6.3) @@ -273,12 +276,12 @@ GEM rails-assets-showdown (0.4.0) rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.5) - 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.1) - loofah (~> 2.0) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging @@ -295,8 +298,9 @@ GEM redis (3.0.7) redis-namespace (1.4.1) redis (~> 3.0.4) - responders (2.0.2) - railties (>= 4.2.0.alpha, < 5) + responders (2.4.1) + actionpack (>= 4.2.0, < 6.0) + railties (>= 4.2.0, < 6.0) rest-client (1.6.7) mime-types (>= 1.16) rspec (3.1.0) @@ -366,12 +370,12 @@ GEM rest-client (~> 1.4) subexec (0.2.3) temple (0.6.7) - thor (0.19.1) - thread_safe (0.3.4) + thor (0.20.3) + thread_safe (0.3.6) tilt (1.4.1) timecop (0.6.3) timers (1.1.0) - tzinfo (1.2.2) + tzinfo (1.2.5) thread_safe (~> 0.1) uglifier (2.4.0) execjs (>= 0.3.0) @@ -382,7 +386,7 @@ GEM unf_ext (0.0.6) uuidtools (2.1.4) vcr (2.9.3) - warden (1.2.3) + warden (1.2.7) rack (>= 1.0) webmock (1.15.2) addressable (>= 2.2.7) @@ -409,7 +413,7 @@ DEPENDENCIES curb customerio database_cleaner - devise (~> 3.1) + devise (~> 4.7) devise-i18n devise_invitable (~> 1.3) doorkeeper