diff --git a/Gemfile b/Gemfile index 9c23585..4a4ee85 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ gem 'elasticsearch-model', git: 'https://github.com/elasticsearch/elasticsearch- gem 'elasticsearch-rails', git: 'https://github.com/elasticsearch/elasticsearch-rails.git' gem 'sidekiq' gem 'aws-sdk' -gem 'doorkeeper', '4.3.2' +gem 'doorkeeper', '5.4.0' gem 'stripe' gem 'whenever' diff --git a/Gemfile.lock b/Gemfile.lock index 78e597c..6993047 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -66,7 +66,7 @@ PATH aws-sdk baby_squeel bcrypt - doorkeeper (= 4.3.2) + doorkeeper (= 5.4.0) draper elasticsearch-model elasticsearch-rails @@ -114,9 +114,9 @@ GEM erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - active_model_serializers (0.10.9) - actionpack (>= 4.1, < 6) - activemodel (>= 4.1, < 6) + active_model_serializers (0.10.10) + actionpack (>= 4.1, < 6.1) + activemodel (>= 4.1, < 6.1) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) activejob (5.1.6) @@ -140,10 +140,10 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - acts_as_downcasable_on (0.2.0) - activerecord (>= 4.0.0, <= 6.0) - acts_as_strippable_on (0.2.0) - activerecord (>= 4.0.0, <= 6.0) + acts_as_downcasable_on (0.2.1) + activerecord (>= 4.0.0, < 7.0) + acts_as_strippable_on (0.2.1) + activerecord (>= 4.0.0, < 7.0) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) ancestry (3.0.2) @@ -752,11 +752,11 @@ GEM activerecord (>= 4.2.0) join_dependency (~> 0.1.2) polyamorous (~> 1.3) - bcrypt (3.1.12) + bcrypt (3.1.16) bourbon (5.1.0) sass (~> 3.4) thor (~> 0.19) - builder (3.2.3) + builder (3.2.4) byebug (10.0.2) capybara (3.5.1) addressable @@ -776,23 +776,23 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.7) connection_pool (2.2.2) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.4) + crass (1.0.6) database_cleaner (1.7.0) diff-lcs (1.3) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) - doorkeeper (4.3.2) - railties (>= 4.2) - draper (3.0.1) - actionpack (~> 5.0) - activemodel (~> 5.0) - activemodel-serializers-xml (~> 1.0) - activesupport (~> 5.0) - request_store (~> 1.0) + doorkeeper (5.4.0) + railties (>= 5) + draper (4.0.1) + actionpack (>= 5.0) + activemodel (>= 5.0) + activemodel-serializers-xml (>= 1.0) + activesupport (>= 5.0) + request_store (>= 1.0) elasticsearch (6.1.0) elasticsearch-api (= 6.1.0) elasticsearch-transport (= 6.1.0) @@ -801,7 +801,7 @@ GEM elasticsearch-transport (6.1.0) faraday multi_json - erubi (1.7.1) + erubi (1.9.0) execjs (2.7.0) factory_bot (4.11.1) activesupport (>= 3.0.0) @@ -829,17 +829,17 @@ GEM domain_name (~> 0.5) http-form_data (1.0.3) http_parser.rb (0.6.0) - i18n (1.1.0) + i18n (1.8.5) concurrent-ruby (~> 1.0) inherited_resources (1.8.0) actionpack (>= 4.2, <= 5.2) has_scope (~> 0.6) railties (>= 4.2, <= 5.2) responders - interactor (3.1.1) - interactor-rails (2.2.0) + interactor (3.1.2) + interactor-rails (2.2.1) interactor (~> 3.0) - rails (>= 4.2, < 5.3) + rails (>= 4.2) jaro_winkler (1.5.1) jmespath (1.4.0) join_dependency (0.1.4) @@ -851,7 +851,7 @@ GEM jquery-ui-rails (6.0.1) railties (>= 3.2.16) json (2.0.2) - jsonapi-renderer (0.2.0) + jsonapi-renderer (0.2.2) kaminari (1.1.1) activesupport (>= 4.1.0) kaminari-actionview (= 1.1.1) @@ -864,18 +864,18 @@ GEM activerecord kaminari-core (= 1.1.1) kaminari-core (1.1.1) - loofah (2.2.2) + loofah (2.7.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.0) mini_mime (>= 0.1.1) - method_source (0.9.0) + method_source (1.0.0) mime-types (3.1) 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.14.2) multi_json (1.13.1) multipart-post (2.0.0) mustermann (1.0.2) @@ -883,10 +883,10 @@ GEM connection_pool (~> 2.2) netrc (0.11.0) nio4r (2.3.1) - nokogiri (1.8.4) - mini_portile2 (~> 2.3.0) - omniauth (1.9.0) - hashie (>= 3.4.6, < 3.7.0) + nokogiri (1.10.10) + mini_portile2 (~> 2.4.0) + omniauth (1.9.1) + hashie (>= 3.4.6) rack (>= 1.6.2, < 3) paper_trail (9.2.0) activerecord (>= 4.2, < 5.3) @@ -905,9 +905,9 @@ GEM activerecord (>= 3.0) powerpack (0.1.2) public_suffix (3.0.2) - pundit (2.0.1) + pundit (2.1.0) activesupport (>= 3.0.0) - rack (2.0.5) + rack (2.2.3) rack-cors (1.0.2) rack-protection (2.0.3) rack @@ -928,8 +928,8 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) rails-jquery-autocomplete (1.0.5) rails (>= 3.2) railties (5.1.6) @@ -939,7 +939,7 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (3.0.0) - rake (12.3.1) + rake (13.0.1) ransack (1.8.8) actionpack (>= 3.0) activerecord (>= 3.0) @@ -1013,7 +1013,7 @@ GEM rack (~> 2.0) rack-protection (= 2.0.3) tilt (~> 2.0) - slim (4.0.1) + slim (4.1.0) temple (>= 0.7.6, < 0.9) tilt (>= 2.0.6, < 2.1) slim-rails (3.2.0) @@ -1033,11 +1033,11 @@ GEM stripe_event (2.3.0) activesupport (>= 3.1) stripe (>= 2.8, < 6) - temple (0.8.1) - thor (0.20.0) + temple (0.8.2) + thor (0.20.3) thread_safe (0.3.6) tilt (2.0.8) - tzinfo (1.2.5) + tzinfo (1.2.7) thread_safe (~> 0.1) ultrahook (0.1.5) json (>= 1.8.0) @@ -1045,10 +1045,10 @@ GEM unf_ext unf_ext (0.0.7.5) unicode-display_width (1.4.0) - versionist (1.7.0) + versionist (2.0.1) activesupport (>= 3) railties (>= 3) - yard (~> 0.9.11) + yard (~> 0.9.20) webmock (3.4.2) addressable (>= 2.3.6) crack (>= 0.3.2) @@ -1060,7 +1060,7 @@ GEM chronic (>= 0.6.3) xpath (3.1.0) nokogiri (~> 1.8) - yard (0.9.18) + yard (0.9.25) PLATFORMS ruby @@ -1075,7 +1075,7 @@ DEPENDENCIES beach_api_core! byebug database_cleaner - doorkeeper (= 4.3.2) + doorkeeper (= 5.4.0) elasticsearch-model! elasticsearch-rails! factory_bot diff --git a/beach_api_core.gemspec b/beach_api_core.gemspec index 9b385e3..c91090d 100644 --- a/beach_api_core.gemspec +++ b/beach_api_core.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| s.add_dependency 'rails' s.add_dependency 'omniauth' - s.add_dependency 'doorkeeper', '4.3.2' + s.add_dependency 'doorkeeper', '5.4.0' s.add_dependency 'pg' s.add_dependency 'baby_squeel'