diff --git a/Gemfile b/Gemfile index 0f1dc41..6d097d5 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem "cancancan", "~> 1.13" gem "mysql2" gem "jbuilder", "~> 2.4" gem "uglifier", "~> 2.7" -gem "devise", "~> 3.5" +gem "devise", "~> 4.7" gem "sidekiq", "~> 4.1" gem "sidekiq-failures", "~> 0.4" gem "sinatra", require: nil diff --git a/Gemfile.lock b/Gemfile.lock index 5732f19..cc1e7f1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -80,7 +80,7 @@ GEM arel (6.0.3) autoprefixer-rails (6.4.0.3) execjs - bcrypt (3.1.11) + bcrypt (3.1.13) better_errors (2.1.1) coderay (>= 1.0.0) erubis (>= 2.6.6) @@ -93,7 +93,7 @@ GEM bourbon (4.2.7) sass (~> 3.4) thor (~> 0.19) - builder (3.2.2) + builder (3.2.4) cancancan (1.15.0) capybara (2.8.1) addressable @@ -116,14 +116,14 @@ GEM coffee-script-source (1.10.0) concurrent-ruby (1.0.2) connection_pool (2.2.0) + crass (1.0.6) database_cleaner (1.5.3) debug_inspector (0.0.2) - 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.2.5) erubis (2.7.0) @@ -170,7 +170,8 @@ GEM haml (~> 4.0.0) nokogiri (~> 1.6.0) ruby_parser (~> 3.5) - i18n (0.7.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) inherited_resources (1.6.0) actionpack (>= 3.2, < 5) has_scope (~> 0.6.0.rc) @@ -186,7 +187,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) railties (>= 3.2.16) - json (1.8.3) + json (1.8.6) kaminari (0.17.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -196,7 +197,8 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.0.3) + loofah (2.4.0) + crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.0.10) mail (2.6.4) @@ -208,14 +210,13 @@ GEM mime-types-data (3.2016.0521) mimemagic (0.3.0) mini_portile2 (2.1.0) - minitest (5.9.0) + minitest (5.14.0) msgpack (1.0.0) multi_json (1.12.1) mysql2 (0.4.4) nenv (0.3.0) - nokogiri (1.6.8) + nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) @@ -235,7 +236,6 @@ GEM parallel (1.9.0) parallel_tests (2.7.1) parallel - pkg-config (1.1.7) polyamorous (1.3.1) activerecord (>= 3.0) pry (0.10.4) @@ -249,7 +249,7 @@ GEM pry quiet_assets (1.1.0) railties (>= 3.1, < 5.0) - rack (1.6.4) + rack (1.6.12) rack-mini-profiler (0.10.1) rack (>= 1.2.0) rack-protection (1.5.3) @@ -269,12 +269,12 @@ 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.3.0) + loofah (~> 2.3) railties (4.2.7.1) actionpack (= 4.2.7.1) activesupport (= 4.2.7.1) @@ -300,8 +300,9 @@ GEM request_store (1.3.1) rerun (0.11.0) listen (~> 3.0) - responders (2.3.0) - railties (>= 4.2.0, < 5.1) + responders (2.4.1) + actionpack (>= 4.2.0, < 6.0) + railties (>= 4.2.0, < 6.0) responsive_active_admin (0.0.5) activeadmin rinruby (2.0.3) @@ -373,8 +374,8 @@ GEM therubyracer (0.12.2) libv8 (~> 3.16.14.0) ref - thor (0.19.1) - thread_safe (0.3.5) + thor (0.20.3) + thread_safe (0.3.6) tilt (2.0.5) transaction_isolation (1.0.3) activerecord (>= 3.0.11) @@ -382,7 +383,7 @@ GEM activerecord (>= 3.0.11) transaction_isolation (>= 1.0.2) trollop (2.1.2) - tzinfo (1.2.2) + tzinfo (1.2.6) thread_safe (~> 0.1) uglifier (2.7.2) execjs (>= 0.3.0) @@ -390,7 +391,7 @@ GEM unicorn (5.1.0) kgio (~> 2.6) raindrops (~> 0.7) - warden (1.2.6) + warden (1.2.7) rack (>= 1.0) xpath (2.0.0) nokogiri (~> 1.3) @@ -410,7 +411,7 @@ DEPENDENCIES capybara coffee-rails database_cleaner - devise (~> 3.5) + devise (~> 4.7) fabrication faker flamegraph