diff --git a/Gemfile b/Gemfile index 3c479dbc5..70b3a40a7 100644 --- a/Gemfile +++ b/Gemfile @@ -21,8 +21,8 @@ gem 'net-pop', '~> 0.1.2' gem 'net-smtp', '~> 0.5.1' gem 'omniauth', '~> 2.1.4' gem 'omniauth-identity', '~> 3.1', '>= 3.1.5' -gem 'omniauth-oauth2', '~> 1.8.0' -gem 'omniauth-rails_csrf_protection', '~> 1.0', '>= 1.0.2' +gem 'omniauth-oauth2', '~> 1.9.0' +gem 'omniauth-rails_csrf_protection', '~> 2.0', '>= 2.0.1' gem 'paper_trail', '~> 17.0.0' gem 'paranoia', '~> 3.1.0' gem 'pg', '~> 1.6.2' diff --git a/Gemfile.lock b/Gemfile.lock index e516bdeac..d5c5c452e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -113,12 +113,12 @@ GEM capistrano (>= 3.9.0) capistrano-bundler sidekiq (>= 7.0) - cgi (0.5.0) + cgi (0.5.1) chunky_png (1.4.0) coderay (1.1.3) colorize (1.1.0) - concurrent-ruby (1.3.5) - connection_pool (2.5.5) + concurrent-ruby (1.3.6) + connection_pool (3.0.2) crass (1.0.6) cssbundling-rails (1.4.3) railties (>= 6.0.0) @@ -215,7 +215,7 @@ GEM domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - i18n (1.14.7) + i18n (1.14.8) concurrent-ruby (~> 1.0) io-console (0.8.1) irb (1.15.3) @@ -255,7 +255,7 @@ GEM ffi-compiler (~> 1.0) rake (~> 13.0) logger (1.7.0) - loofah (2.24.1) + loofah (2.25.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) lumberjack (1.4.2) @@ -274,7 +274,8 @@ GEM mina (1.2.5) rake mini_mime (1.1.5) - minitest (5.26.2) + minitest (6.0.0) + prism (~> 1.5) mollie-api-ruby (4.18.0) bigdecimal (~> 3.1, >= 3.1.8) ostruct (~> 0.6.0) @@ -325,10 +326,10 @@ GEM mutex_m (~> 0.1) omniauth (>= 1) version_gem (~> 1.1, >= 1.1.9) - omniauth-oauth2 (1.8.0) - oauth2 (>= 1.4, < 3) + omniauth-oauth2 (1.9.0) + oauth2 (>= 2.0.2, < 3) omniauth (~> 2.0) - omniauth-rails_csrf_protection (1.0.2) + omniauth-rails_csrf_protection (2.0.1) actionpack (>= 4.2) omniauth (~> 2.0) orm_adapter (0.5.0) @@ -643,8 +644,8 @@ DEPENDENCIES net-smtp (~> 0.5.1) omniauth (~> 2.1.4) omniauth-identity (~> 3.1, >= 3.1.5) - omniauth-oauth2 (~> 1.8.0) - omniauth-rails_csrf_protection (~> 1.0, >= 1.0.2) + omniauth-oauth2 (~> 1.9.0) + omniauth-rails_csrf_protection (~> 2.0, >= 2.0.1) paper_trail (~> 17.0.0) paranoia (~> 3.1.0) pg (~> 1.6.2) diff --git a/config/application.rb b/config/application.rb index f130fa783..f0db2030c 100644 --- a/config/application.rb +++ b/config/application.rb @@ -28,7 +28,11 @@ class Application < Rails::Application config.i18n.default_locale = :nl config.i18n.fallbacks = [:nl] - config.cache_store = :redis_cache_store, { url: Rails.application.config_for(:cable)['url'] } + config.cache_store = :redis_cache_store, { + url: Rails.application.config_for(:cable)['url'], + pool_size: ENV.fetch('RAILS_MAX_THREADS', 5).to_i, + pool_timeout: 5 + } config.active_job.queue_adapter = :sidekiq config.exceptions_app = routes