From 124e2ccc9fadd2ecaff584c0c5f202e56ed5abac Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 7 May 2023 15:33:35 +0000 Subject: [PATCH 1/4] chore(deps): update all non-major bundler dependencies --- Gemfile | 76 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/Gemfile b/Gemfile index 5fe5a5513..30697318c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,47 +1,47 @@ source 'https://rubygems.org' -gem 'bcrypt', '~> 3.1.0' -gem 'bootsnap', '~> 1.12.0' -gem 'browser', '~> 5.3.0' -gem 'devise', '~>4.8.0' -gem 'devise-i18n', '~>1.10.0' +gem 'bcrypt', '~> 3.1.18' +gem 'bootsnap', '~> 1.16.0' +gem 'browser', '~> 5.3.1' +gem 'devise', '~>4.9.2' +gem 'devise-i18n', '~>1.11.0' gem 'factory_bot_rails', '~> 6.2.0' -gem 'faker', '~> 3.1.1' -gem 'font-awesome-rails', '~> 4.7.0.0' -gem 'http', '~> 5.0.0' -gem 'jbuilder', '~> 2.11.0' -gem 'jquery-rails', '~> 4.5.0' -gem 'kaminari', '~> 1.2.0' -gem 'mini_racer', '~> 0.6.0' -gem 'mollie-api-ruby', '~> 4.7.0' +gem 'faker', '~> 3.2.0' +gem 'font-awesome-rails', '~> 4.7.0.8' +gem 'http', '~> 5.1.1' +gem 'jbuilder', '~> 2.11.5' +gem 'jquery-rails', '~> 4.5.1' +gem 'kaminari', '~> 1.2.2' +gem 'mini_racer', '~> 0.6.3' +gem 'mollie-api-ruby', '~> 4.7.1' gem 'net-imap', require: false gem 'net-pop', require: false gem 'net-smtp', require: false -gem 'omniauth', '~> 2.0.0' -gem 'omniauth-oauth2', '~> 1.7.0' -gem 'omniauth-rails_csrf_protection', '~> 1.0' +gem 'omniauth', '~> 2.1.1' +gem 'omniauth-oauth2', '~> 1.8.0' +gem 'omniauth-rails_csrf_protection', '~> 1.0', '>= 1.0.1' gem 'paper_trail', '~> 14.0.0' -gem 'paranoia', '~> 2.6.0' -gem 'pg', '~> 1.3.0' -gem 'puma', '~> 6.1.1' -gem 'pundit', '~> 2.2.0' -gem 'rack-attack', '~> 6.6.0' -gem 'rails', '~> 6.1.0' -gem 'rails-i18n', '~> 7.0.0' -gem 'redis-rails', '~> 5.0.0' +gem 'paranoia', '~> 2.6.1' +gem 'pg', '~> 1.5.3' +gem 'puma', '~> 6.2.2' +gem 'pundit', '~> 2.3.0' +gem 'rack-attack', '~> 6.6.1' +gem 'rails', '~> 6.1.7', '>= 6.1.7.3' +gem 'rails-i18n', '~> 7.0.6' +gem 'redis-rails', '~> 5.0.2' gem 'rest-client', '~> 2.1.0' -gem 'sassc-rails', '~> 2.1.0' -gem 'sentry-rails', '~> 5.5' -gem 'sentry-ruby', '~> 5.5' -gem 'sentry-sidekiq', '~> 5.5' -gem 'sidekiq', '~> 7.0.6' +gem 'sassc-rails', '~> 2.1.2' +gem 'sentry-rails', '~> 5.9' +gem 'sentry-ruby', '~> 5.9' +gem 'sentry-sidekiq', '~> 5.9' +gem 'sidekiq', '~> 7.1.0' gem 'sidekiq-scheduler', '~> 5.0.2' -gem 'simple_form', '~> 5.1.0' +gem 'simple_form', '~> 5.2.0' gem 'slack-notifier', '~> 2.4.0' -gem 'turbolinks', '~> 5.2.0' +gem 'turbolinks', '~> 5.2.1' gem 'uglifier', '~> 4.2.0' -gem 'validates_timeliness', '~> 6.0.0.beta2' -gem 'webpacker', '~> 5.4.0' +gem 'validates_timeliness', '~> 6.0.1' +gem 'webpacker', '~> 5.4.4' gem 'wicked_pdf' gem 'wkhtmltopdf-binary' @@ -52,8 +52,8 @@ group :development, :test do gem 'bullet' gem 'colorize' gem 'consistency_fail' - gem 'dotenv-rails', '~> 2.7.0' - gem 'guard-livereload', '~> 2.5.0' + gem 'dotenv-rails', '~> 2.8.1' + gem 'guard-livereload', '~> 2.5.2' gem 'guard-rspec', require: false gem 'pry-byebug' gem 'pry-rails' @@ -65,7 +65,7 @@ group :development do gem 'capistrano-sidekiq' gem 'foreman', require: false gem 'listen' - gem 'mina', '~> 1.2.0' + gem 'mina', '~> 1.2.4' gem 'spring', require: false gem 'spring-commands-rspec', require: false gem 'spring-watcher-listen', require: false @@ -73,8 +73,8 @@ group :development do end group :test do - gem 'rails-controller-testing', '~> 1.0.0' - gem 'rubocop', '~> 1.30.0', require: false + gem 'rails-controller-testing', '~> 1.0.5' + gem 'rubocop', '~> 1.50.2', require: false gem 'rubocop-performance' gem 'rubocop-rails' gem 'rubocop-rspec' From a2d2f1f9a12506949b2db3abf970db73aa706238 Mon Sep 17 00:00:00 2001 From: Wilco van Beijnum Date: Sun, 7 May 2023 17:57:28 +0200 Subject: [PATCH 2/4] Update dependencies --- Gemfile.lock | 346 ++++++++++++++++++++++++++------------------------- 1 file changed, 178 insertions(+), 168 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8e97d66c6..cc7ce70da 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,67 +1,67 @@ GEM remote: https://rubygems.org/ specs: - actioncable (6.1.6) - actionpack (= 6.1.6) - activesupport (= 6.1.6) + actioncable (6.1.7.3) + actionpack (= 6.1.7.3) + activesupport (= 6.1.7.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.6) - actionpack (= 6.1.6) - activejob (= 6.1.6) - activerecord (= 6.1.6) - activestorage (= 6.1.6) - activesupport (= 6.1.6) + actionmailbox (6.1.7.3) + actionpack (= 6.1.7.3) + activejob (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) mail (>= 2.7.1) - actionmailer (6.1.6) - actionpack (= 6.1.6) - actionview (= 6.1.6) - activejob (= 6.1.6) - activesupport (= 6.1.6) + actionmailer (6.1.7.3) + actionpack (= 6.1.7.3) + actionview (= 6.1.7.3) + activejob (= 6.1.7.3) + activesupport (= 6.1.7.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.6) - actionview (= 6.1.6) - activesupport (= 6.1.6) + actionpack (6.1.7.3) + actionview (= 6.1.7.3) + activesupport (= 6.1.7.3) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.6) - actionpack (= 6.1.6) - activerecord (= 6.1.6) - activestorage (= 6.1.6) - activesupport (= 6.1.6) + actiontext (6.1.7.3) + actionpack (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) nokogiri (>= 1.8.5) - actionview (6.1.6) - activesupport (= 6.1.6) + actionview (6.1.7.3) + activesupport (= 6.1.7.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.6) - activesupport (= 6.1.6) + activejob (6.1.7.3) + activesupport (= 6.1.7.3) globalid (>= 0.3.6) - activemodel (6.1.6) - activesupport (= 6.1.6) - activerecord (6.1.6) - activemodel (= 6.1.6) - activesupport (= 6.1.6) - activestorage (6.1.6) - actionpack (= 6.1.6) - activejob (= 6.1.6) - activerecord (= 6.1.6) - activesupport (= 6.1.6) + activemodel (6.1.7.3) + activesupport (= 6.1.7.3) + activerecord (6.1.7.3) + activemodel (= 6.1.7.3) + activesupport (= 6.1.7.3) + activestorage (6.1.7.3) + actionpack (= 6.1.7.3) + activejob (= 6.1.7.3) + activerecord (= 6.1.7.3) + activesupport (= 6.1.7.3) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.6) + activesupport (6.1.7.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.4) + public_suffix (>= 2.0.2, < 6.0) airbrussh (1.4.0) sshkit (>= 1.6.1, != 1.7.0) ast (2.4.2) @@ -72,7 +72,7 @@ GEM erubi (>= 1.0.0) rack (>= 0.9.0) bindex (0.8.1) - bootsnap (1.12.0) + bootsnap (1.16.0) msgpack (~> 1.2) brakeman (5.2.3) browser (5.3.1) @@ -95,30 +95,30 @@ GEM coderay (1.1.3) colorize (0.8.1) concurrent-ruby (1.2.2) - connection_pool (2.3.0) + connection_pool (2.4.0) consistency_fail (0.3.7) crass (1.0.6) - devise (4.8.1) + devise (4.9.2) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) responders warden (~> 1.2.3) - devise-i18n (1.10.2) - devise (>= 4.8.0) + devise-i18n (1.11.0) + devise (>= 4.9.0) diff-lcs (1.5.0) digest (3.1.0) docile (1.4.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - dotenv (2.7.6) - dotenv-rails (2.7.6) - dotenv (= 2.7.6) + dotenv (2.8.1) + dotenv-rails (2.8.1) + dotenv (= 2.8.1) railties (>= 3.2) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) - erubi (1.10.0) + erubi (1.12.0) et-orbi (1.2.7) tzinfo eventmachine (1.2.7) @@ -128,12 +128,12 @@ GEM factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faker (3.1.1) + faker (3.2.0) i18n (>= 1.8.11, < 2) - faraday (2.3.0) - faraday-net_http (~> 2.0) + faraday (2.7.4) + faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-net_http (2.0.3) + faraday-net_http (3.0.2) ffi (1.15.5) ffi-compiler (1.0.1) ffi (>= 1.0.0) @@ -145,7 +145,7 @@ GEM fugit (1.8.1) et-orbi (~> 1, >= 1.2.7) raabro (~> 1.4) - globalid (1.0.0) + globalid (1.1.0) activesupport (>= 5.0) guard (2.18.0) formatador (>= 0.2.4) @@ -167,7 +167,7 @@ GEM guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) hashie (5.0.0) - http (5.0.4) + http (5.1.1) addressable (~> 2.8) http-cookie (~> 1.0) http-form_data (~> 2.2) @@ -177,16 +177,17 @@ GEM domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.8.0) - i18n (1.12.0) + i18n (1.13.0) concurrent-ruby (~> 1.0) jbuilder (2.11.5) actionview (>= 5.0.0) activesupport (>= 5.0.0) - jquery-rails (4.5.0) + jquery-rails (4.5.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jwt (2.4.1) + json (2.6.3) + jwt (2.7.0) kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -207,12 +208,15 @@ GEM llhttp-ffi (0.4.0) ffi-compiler (~> 1.0) rake (~> 13.0) - loofah (2.18.0) + loofah (2.20.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.2.8) - mail (2.7.1) + mail (2.8.1) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp marcel (1.0.2) method_source (1.0.0) mime-types (3.4.1) @@ -222,12 +226,12 @@ GEM open4 (~> 1.3.4) rake mini_mime (1.1.2) - mini_portile2 (2.8.0) - mini_racer (0.6.2) + mini_portile2 (2.8.2) + mini_racer (0.6.3) libv8-node (~> 16.10.0.0) - minitest (5.16.3) + minitest (5.18.0) mollie-api-ruby (4.7.1) - msgpack (1.5.2) + msgpack (1.7.0) multi_json (1.15.0) multi_xml (0.6.0) nenv (0.3.0) @@ -249,28 +253,29 @@ GEM timeout net-ssh (6.1.0) netrc (0.11.0) - nio4r (2.5.8) - nokogiri (1.13.6) + nio4r (2.5.9) + nokogiri (1.14.3) mini_portile2 (~> 2.8.0) racc (~> 1.4) - nokogiri (1.13.6-x86_64-linux) + nokogiri (1.14.3-x86_64-linux) racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) - oauth2 (1.4.9) + oauth2 (2.0.9) faraday (>= 0.17.3, < 3.0) jwt (>= 1.0, < 3.0) - multi_json (~> 1.3) multi_xml (~> 0.5) - rack (>= 1.2, < 3) - omniauth (2.0.4) + rack (>= 1.2, < 4) + snaky_hash (~> 2.0) + version_gem (~> 1.1) + omniauth (2.1.1) hashie (>= 3.4.6) - rack (>= 1.6.2, < 3) + rack (>= 2.2.3) rack-protection - omniauth-oauth2 (1.7.2) - oauth2 (~> 1.4) - omniauth (>= 1.9, < 3) + omniauth-oauth2 (1.8.0) + oauth2 (>= 1.4, < 3) + omniauth (~> 2.0) omniauth-rails_csrf_protection (1.0.1) actionpack (>= 4.2) omniauth (~> 2.0) @@ -279,12 +284,12 @@ GEM paper_trail (14.0.0) activerecord (>= 6.0) request_store (~> 1.4) - parallel (1.22.1) - paranoia (2.6.0) + parallel (1.23.0) + paranoia (2.6.1) activerecord (>= 5.1, < 7.1) - parser (3.1.2.0) + parser (3.2.2.1) ast (~> 2.4.1) - pg (1.3.5) + pg (1.5.3) pry (0.13.1) coderay (~> 1.1) method_source (~> 1.0) @@ -293,36 +298,36 @@ GEM pry (~> 0.13.0) pry-rails (0.3.9) pry (>= 0.10.4) - public_suffix (4.0.7) - puma (6.1.1) + public_suffix (5.0.1) + puma (6.2.2) nio4r (~> 2.0) - pundit (2.2.0) + pundit (2.3.0) activesupport (>= 3.0.0) raabro (1.4.0) - racc (1.6.0) + racc (1.6.2) rack (2.2.7) rack-attack (6.6.1) rack (>= 1.0, < 3) - rack-protection (3.0.2) + rack-protection (3.0.6) rack - rack-proxy (0.7.2) + rack-proxy (0.7.6) rack - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (6.1.6) - actioncable (= 6.1.6) - actionmailbox (= 6.1.6) - actionmailer (= 6.1.6) - actionpack (= 6.1.6) - actiontext (= 6.1.6) - actionview (= 6.1.6) - activejob (= 6.1.6) - activemodel (= 6.1.6) - activerecord (= 6.1.6) - activestorage (= 6.1.6) - activesupport (= 6.1.6) + rack-test (2.1.0) + rack (>= 1.3) + rails (6.1.7.3) + actioncable (= 6.1.7.3) + actionmailbox (= 6.1.7.3) + actionmailer (= 6.1.7.3) + actionpack (= 6.1.7.3) + actiontext (= 6.1.7.3) + actionview (= 6.1.7.3) + activejob (= 6.1.7.3) + activemodel (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) bundler (>= 1.15.0) - railties (= 6.1.6) + railties (= 6.1.7.3) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -331,14 +336,14 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) - rails-i18n (7.0.3) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) + rails-i18n (7.0.6) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (6.1.6) - actionpack (= 6.1.6) - activesupport (= 6.1.6) + railties (6.1.7.3) + actionpack (= 6.1.7.3) + activesupport (= 6.1.7.3) method_source rake (>= 12.2) thor (~> 1.0) @@ -356,7 +361,7 @@ GEM redis-activesupport (5.3.0) activesupport (>= 3, < 8) redis-store (>= 1.3, < 2) - redis-client (0.13.0) + redis-client (0.14.1) connection_pool redis-rack (2.1.4) rack (>= 2.0.8, < 3) @@ -367,12 +372,12 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.9.1) redis (>= 4, < 5) - regexp_parser (2.5.0) + regexp_parser (2.8.0) request_store (1.5.1) rack (>= 1.4) - responders (3.0.1) - actionpack (>= 5.0) - railties (>= 5.0) + responders (3.1.0) + actionpack (>= 5.2) + railties (>= 5.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) @@ -400,17 +405,18 @@ GEM rspec-mocks (~> 3.10) rspec-support (~> 3.10) rspec-support (3.11.0) - rubocop (1.30.1) + rubocop (1.50.2) + json (~> 2.3) parallel (~> 1.10) - parser (>= 3.1.0.0) + parser (>= 3.2.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.18.0, < 2.0) + rubocop-ast (>= 1.28.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.18.0) - parser (>= 3.1.1.0) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.28.1) + parser (>= 3.2.1.0) rubocop-performance (1.14.2) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -420,7 +426,7 @@ GEM rubocop (>= 1.7.0, < 2.0) rubocop-rspec (2.11.1) rubocop (~> 1.19) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) rufus-scheduler (3.8.2) fugit (~> 1.1, >= 1.1.6) @@ -433,25 +439,25 @@ GEM sprockets-rails tilt semantic_range (3.0.0) - sentry-rails (5.5.0) + sentry-rails (5.9.0) railties (>= 5.0) - sentry-ruby (~> 5.5.0) - sentry-ruby (5.5.0) + sentry-ruby (~> 5.9.0) + sentry-ruby (5.9.0) concurrent-ruby (~> 1.0, >= 1.0.2) - sentry-sidekiq (5.5.0) - sentry-ruby (~> 5.5.0) + sentry-sidekiq (5.9.0) + sentry-ruby (~> 5.9.0) sidekiq (>= 3.0) shellany (0.0.1) - sidekiq (7.0.9) + sidekiq (7.1.0) concurrent-ruby (< 2) connection_pool (>= 2.3.0) rack (>= 2.2.4) - redis-client (>= 0.11.0) + redis-client (>= 0.14.0) sidekiq-scheduler (5.0.2) rufus-scheduler (~> 3.2) sidekiq (>= 6, < 8) tilt (>= 1.4.0) - simple_form (5.1.0) + simple_form (5.2.0) actionpack (>= 5.2) activemodel (>= 5.2) simplecov (0.21.2) @@ -461,6 +467,9 @@ GEM simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) slack-notifier (2.4.0) + snaky_hash (2.0.1) + hashie + version_gem (~> 1.1, >= 1.1.1) spring (2.1.1) spring-commands-rspec (1.0.4) spring (>= 0.9.1) @@ -482,7 +491,7 @@ GEM thor (1.2.1) tilt (2.1.0) timecop (0.9.5) - timeliness (0.4.4) + timeliness (0.4.5) timeout (0.3.0) turbolinks (5.2.1) turbolinks-source (~> 5.2) @@ -494,11 +503,12 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.8.2) - unicode-display_width (2.1.0) + unicode-display_width (2.4.2) uniform_notifier (1.16.0) - validates_timeliness (6.0.0.beta2) + validates_timeliness (6.0.1) activemodel (>= 6.0.0, < 7) timeliness (>= 0.3.10, < 1) + version_gem (1.1.2) warden (1.2.9) rack (>= 2.0.9) web-console (4.2.0) @@ -506,7 +516,7 @@ GEM activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) - webpacker (5.4.3) + webpacker (5.4.4) activesupport (>= 5.2) rack-proxy (>= 0.6.1) railties (>= 5.2) @@ -517,7 +527,7 @@ GEM wicked_pdf (2.6.3) activesupport wkhtmltopdf-binary (0.12.6.5) - zeitwerk (2.6.6) + zeitwerk (2.6.8) PLATFORMS ruby @@ -525,64 +535,64 @@ PLATFORMS DEPENDENCIES awesome_print - bcrypt (~> 3.1.0) + bcrypt (~> 3.1.18) better_errors - bootsnap (~> 1.12.0) + bootsnap (~> 1.16.0) brakeman - browser (~> 5.3.0) + browser (~> 5.3.1) bullet capistrano-sidekiq colorize consistency_fail - devise (~> 4.8.0) - devise-i18n (~> 1.10.0) - dotenv-rails (~> 2.7.0) + devise (~> 4.9.2) + devise-i18n (~> 1.11.0) + dotenv-rails (~> 2.8.1) factory_bot_rails (~> 6.2.0) - faker (~> 3.1.1) - font-awesome-rails (~> 4.7.0.0) + faker (~> 3.2.0) + font-awesome-rails (~> 4.7.0.8) foreman - guard-livereload (~> 2.5.0) + guard-livereload (~> 2.5.2) guard-rspec - http (~> 5.0.0) - jbuilder (~> 2.11.0) - jquery-rails (~> 4.5.0) - kaminari (~> 1.2.0) + http (~> 5.1.1) + jbuilder (~> 2.11.5) + jquery-rails (~> 4.5.1) + kaminari (~> 1.2.2) listen - mina (~> 1.2.0) - mini_racer (~> 0.6.0) - mollie-api-ruby (~> 4.7.0) + mina (~> 1.2.4) + mini_racer (~> 0.6.3) + mollie-api-ruby (~> 4.7.1) net-imap net-pop net-smtp - omniauth (~> 2.0.0) - omniauth-oauth2 (~> 1.7.0) - omniauth-rails_csrf_protection (~> 1.0) + omniauth (~> 2.1.1) + omniauth-oauth2 (~> 1.8.0) + omniauth-rails_csrf_protection (~> 1.0, >= 1.0.1) paper_trail (~> 14.0.0) - paranoia (~> 2.6.0) - pg (~> 1.3.0) + paranoia (~> 2.6.1) + pg (~> 1.5.3) pry-byebug pry-rails - puma (~> 6.1.1) - pundit (~> 2.2.0) - rack-attack (~> 6.6.0) - rails (~> 6.1.0) - rails-controller-testing (~> 1.0.0) - rails-i18n (~> 7.0.0) + puma (~> 6.2.2) + pundit (~> 2.3.0) + rack-attack (~> 6.6.1) + rails (~> 6.1.7, >= 6.1.7.3) + rails-controller-testing (~> 1.0.5) + rails-i18n (~> 7.0.6) rb-readline - redis-rails (~> 5.0.0) + redis-rails (~> 5.0.2) rest-client (~> 2.1.0) rspec-rails - rubocop (~> 1.30.0) + rubocop (~> 1.50.2) rubocop-performance rubocop-rails rubocop-rspec - sassc-rails (~> 2.1.0) - sentry-rails (~> 5.5) - sentry-ruby (~> 5.5) - sentry-sidekiq (~> 5.5) - sidekiq (~> 7.0.6) + sassc-rails (~> 2.1.2) + sentry-rails (~> 5.9) + sentry-ruby (~> 5.9) + sentry-sidekiq (~> 5.9) + sidekiq (~> 7.1.0) sidekiq-scheduler (~> 5.0.2) - simple_form (~> 5.1.0) + simple_form (~> 5.2.0) simplecov slack-notifier (~> 2.4.0) spring @@ -590,12 +600,12 @@ DEPENDENCIES spring-watcher-listen terminal-notifier-guard timecop - turbolinks (~> 5.2.0) + turbolinks (~> 5.2.1) tzinfo-data uglifier (~> 4.2.0) - validates_timeliness (~> 6.0.0.beta2) + validates_timeliness (~> 6.0.1) web-console (~> 4.2.0) - webpacker (~> 5.4.0) + webpacker (~> 5.4.4) wicked_pdf wkhtmltopdf-binary From 037c8f1b63506f385365ea2f98ac0087c4594b44 Mon Sep 17 00:00:00 2001 From: Wilco van Beijnum Date: Sun, 7 May 2023 18:28:27 +0200 Subject: [PATCH 3/4] Fix lint --- app/controllers/users_controller.rb | 2 +- app/jobs/credit_insufficient_notification_job.rb | 4 ++-- config/environments/production.rb | 2 +- spec/rails_helper.rb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index eeefa5ac0..f1ed0ead4 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -120,7 +120,7 @@ def send_slack_users_refresh_notification return unless Rails.env.production? || Rails.env.staging? # :nocov: - SlackMessageJob.perform_later("User ##{current_user.id} (#{current_user.name}) "\ + SlackMessageJob.perform_later("User ##{current_user.id} (#{current_user.name}) " \ "is importing users from Amber (#{Rails.application.config.x.amber_api_host})") # :nocov: end diff --git a/app/jobs/credit_insufficient_notification_job.rb b/app/jobs/credit_insufficient_notification_job.rb index ad3ab2d6e..87b4bd616 100644 --- a/app/jobs/credit_insufficient_notification_job.rb +++ b/app/jobs/credit_insufficient_notification_job.rb @@ -32,8 +32,8 @@ def send_notification_delivery_reports(success_count, unnotifyable_users) return unless Rails.env.production? || Rails.env.staging? - SlackMessageJob.perform_later("Er is voor #{Rails.application.config.x.amber_api_host} een saldomail "\ - "verstuurd naar #{success_count} mensen, en #{unnotifyable_users.count} saldomail(s) kon(den) niet "\ + SlackMessageJob.perform_later("Er is voor #{Rails.application.config.x.amber_api_host} een saldomail " \ + "verstuurd naar #{success_count} mensen, en #{unnotifyable_users.count} saldomail(s) kon(den) niet " \ 'verzonden worden door het ontbreken van een e-mail adres.') HealthCheckJob.perform_later('credit_insufficient') diff --git a/config/environments/production.rb b/config/environments/production.rb index 4fb19b381..8100113ca 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -77,7 +77,7 @@ config.active_support.deprecation = :notify # Use default logging formatter so that PID and timestamp are not suppressed. - config.log_formatter = ::Logger::Formatter.new + config.log_formatter = Logger::Formatter.new # Use a different logger for distributed setups. # require 'syslog/logger' diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index db2a6d325..95804b01f 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -33,7 +33,7 @@ config.include Devise::Test::ControllerHelpers, type: :controller # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures - config.fixture_path = "#{::Rails.root}/spec/fixtures" + config.fixture_path = Rails.root.join('spec', 'fixtures') # If you're not using ActiveRecord, or you'd prefer not to run each of your # examples within a transaction, remove the following line or assign false From 55b9e294657a0caf3816cc762b48f4605fcba513 Mon Sep 17 00:00:00 2001 From: Ellen Date: Tue, 31 Oct 2023 21:59:46 +0100 Subject: [PATCH 4/4] put json back --- Gemfile.lock | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile.lock b/Gemfile.lock index fddc548a6..5b315c5fd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -411,6 +411,7 @@ GEM rspec-support (~> 3.12) rspec-support (3.12.0) rubocop (1.50.2) + json (~> 2.3) parallel (~> 1.10) parser (>= 3.2.0.0) rainbow (>= 2.2.2, < 4.0)