From 6e9d506b6115a72ed493d8863b929f88c43431db Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:06:50 +0100 Subject: [PATCH 01/69] chore(bundle): Update aasm from 5.2.0 to 5.5.0 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2b58627d346..cfadf6b69f3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,7 +13,7 @@ GIT GEM remote: https://rubygems.org/ specs: - aasm (5.2.0) + aasm (5.5.0) concurrent-ruby (~> 1.0) acsv (0.0.1) actioncable (7.0.8) @@ -175,7 +175,7 @@ GEM clamav-client (3.2.0) coercible (1.0.0) descendants_tracker (~> 0.0.1) - concurrent-ruby (1.2.2) + concurrent-ruby (1.2.3) connection_pool (2.4.1) content_disposition (1.0.0) crack (0.4.5) From fe0a59bbed62e03832887a1b391b6ee4aa6b038f Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:07:09 +0100 Subject: [PATCH 02/69] chore(bundle): Update active_storage_validations from 0.9.6 to 1.1.4 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index cfadf6b69f3..0b4dca0ff25 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -66,7 +66,7 @@ GEM activemodel (>= 4.1, < 7.1) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - active_storage_validations (0.9.6) + active_storage_validations (1.1.4) activejob (>= 5.2.0) activemodel (>= 5.2.0) activestorage (>= 5.2.0) From c58a890bf4bc3c118cb0e67d73297c754303df06 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:07:04 +0100 Subject: [PATCH 03/69] chore(bundle): Update active_model_serializers from 0.10.13 to 0.10.14 --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0b4dca0ff25..41a5300eb25 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -61,9 +61,9 @@ GEM erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - active_model_serializers (0.10.13) - actionpack (>= 4.1, < 7.1) - activemodel (>= 4.1, < 7.1) + active_model_serializers (0.10.14) + actionpack (>= 4.1) + activemodel (>= 4.1) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) active_storage_validations (1.1.4) @@ -440,7 +440,7 @@ GEM mini_magick (4.11.0) mini_mime (1.1.5) mini_portile2 (2.8.5) - minitest (5.20.0) + minitest (5.21.2) msgpack (1.4.2) multi_json (1.15.0) mustermann (3.0.0) From 9953f989b8a44c1ea62e2903f1b3fbe3ce665db0 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:07:17 +0100 Subject: [PATCH 04/69] chore(bundle): Update axe-core-rspec from 4.8.0 to 4.8.1 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 41a5300eb25..f51c5196a27 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -114,10 +114,10 @@ GEM anchored (1.1.0) ast (2.4.2) attr_required (1.0.1) - axe-core-api (4.8.0) + axe-core-api (4.8.1) dumb_delegator virtus - axe-core-rspec (4.8.0) + axe-core-rspec (4.8.1) axe-core-api dumb_delegator virtus From 555c4a10b24d3dfabcf7294ff58f320ea622c377 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:07:30 +0100 Subject: [PATCH 05/69] chore(bundle): Update bcrypt from 3.1.19 to 3.1.20 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f51c5196a27..9f4a943cc4a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -128,7 +128,7 @@ GEM axlsx_styler (1.1.0) activesupport (>= 3.1) caxlsx (>= 2.0.2) - bcrypt (3.1.19) + bcrypt (3.1.20) benchmark-ips (2.12.0) better_html (1.0.16) actionview (>= 4.0) From 6ea6b37b7c900281eb87a51dad944fd49e0c4030 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:07:34 +0100 Subject: [PATCH 06/69] chore(bundle): Update benchmark-ips from 2.12.0 to 2.13.0 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9f4a943cc4a..601da5ecf6f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -129,7 +129,7 @@ GEM activesupport (>= 3.1) caxlsx (>= 2.0.2) bcrypt (3.1.20) - benchmark-ips (2.12.0) + benchmark-ips (2.13.0) better_html (1.0.16) actionview (>= 4.0) activesupport (>= 4.0) From 947f361a5c799e32d61682d792d91fb87f62e365 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:07:44 +0100 Subject: [PATCH 07/69] chore(bundle): Update bootsnap from 1.9.3 to 1.18.3 --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 601da5ecf6f..04aa615c02d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -140,8 +140,8 @@ GEM smart_properties bindata (2.4.10) bindex (0.8.1) - bootsnap (1.9.3) - msgpack (~> 1.0) + bootsnap (1.18.3) + msgpack (~> 1.2) brakeman (5.4.1) brow (0.4.1) browser (5.3.1) @@ -441,7 +441,7 @@ GEM mini_mime (1.1.5) mini_portile2 (2.8.5) minitest (5.21.2) - msgpack (1.4.2) + msgpack (1.7.2) multi_json (1.15.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) From 6eb0c224c868f0ba9a88d780487c9bb43d764573 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:07:49 +0100 Subject: [PATCH 08/69] chore(bundle): Update brakeman from 5.4.1 to 6.1.2 --- Gemfile.lock | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 04aa615c02d..a496b5f374c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -142,7 +142,8 @@ GEM bindex (0.8.1) bootsnap (1.18.3) msgpack (~> 1.2) - brakeman (5.4.1) + brakeman (6.1.2) + racc brow (0.4.1) browser (5.3.1) builder (3.2.4) From 4b1288317159f58ffd4f719bcc05217805bc51b3 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:07:53 +0100 Subject: [PATCH 09/69] chore(bundle): Update capybara from 3.39.2 to 3.40.0 --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a496b5f374c..92323b304b7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -147,11 +147,11 @@ GEM brow (0.4.1) browser (5.3.1) builder (3.2.4) - capybara (3.39.2) + capybara (3.40.0) addressable matrix mini_mime (>= 0.1.3) - nokogiri (~> 1.8) + nokogiri (~> 1.11) rack (>= 1.6.0) rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) @@ -579,7 +579,7 @@ GEM redis-client (>= 0.9.0) redis-client (0.18.0) connection_pool - regexp_parser (2.8.1) + regexp_parser (2.9.0) reline (0.4.2) io-console (~> 0.5) request_store (1.5.0) From 1f4ff826a7897e78c8399a48a887e0606a305eb6 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:07:58 +0100 Subject: [PATCH 10/69] chore(bundle): Update chartkick from 5.0.4 to 5.0.5 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 92323b304b7..99c90a53fc0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -170,7 +170,7 @@ GEM nokogiri (~> 1.10, >= 1.10.4) rubyzip (>= 1.3.0, < 3) charlock_holmes (0.7.7) - chartkick (5.0.4) + chartkick (5.0.5) choice (0.2.0) chunky_png (1.4.0) clamav-client (3.2.0) From fe84714c1679361e27841b49ed4c939e899bc987 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:08:02 +0100 Subject: [PATCH 11/69] chore(bundle): Update daemons from 1.3.1 to 1.4.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 99c90a53fc0..3737076c6a9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -184,7 +184,7 @@ GEM crass (1.0.6) css_parser (1.16.0) addressable - daemons (1.3.1) + daemons (1.4.1) date (3.3.4) deep_cloneable (3.2.0) activerecord (>= 3.1.0, < 8) From 78bd09c15c8c527fb67e56c26583016ad87d8950 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:08:10 +0100 Subject: [PATCH 12/69] chore(bundle): Update delayed_job_active_record from 4.1.7 to 4.1.8 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3737076c6a9..ed3c40e9559 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -192,7 +192,7 @@ GEM delayed_job (>= 4.1) delayed_job (4.1.11) activesupport (>= 3.0, < 8.0) - delayed_job_active_record (4.1.7) + delayed_job_active_record (4.1.8) activerecord (>= 3.0, < 8.0) delayed_job (>= 3.0, < 5) delayed_job_web (1.4.4) From 8e069dbd5a4d67491a82429d5938dbb896222c37 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:08:14 +0100 Subject: [PATCH 13/69] chore(bundle): Update devise-i18n from 1.9.2 to 1.12.0 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ed3c40e9559..7251ffba96e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -202,8 +202,8 @@ GEM sinatra (>= 1.4.4) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise-i18n (1.9.2) - devise (>= 4.7.1) + devise-i18n (1.12.0) + devise (>= 4.9.0) devise-two-factor (5.0.0) activesupport (~> 7.0) devise (~> 4.0) From 9ec0574eda50f9f87646509d9f33bcd622656ae5 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:08:18 +0100 Subject: [PATCH 14/69] chore(bundle): Update discard from 1.2.1 to 1.3.0 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7251ffba96e..f8d6fa60ab2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -210,7 +210,7 @@ GEM railties (~> 7.0) rotp (~> 6.0) diff-lcs (1.5.0) - discard (1.2.1) + discard (1.3.0) activerecord (>= 4.2, < 8) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) From 8ed2d114b4bb816866a1cdf7c509d7a60799e060 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:08:23 +0100 Subject: [PATCH 15/69] chore(bundle): Update dotenv-rails from 2.7.6 to 2.8.1 --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f8d6fa60ab2..b060dc4a70a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -214,9 +214,9 @@ GEM activerecord (>= 4.2, < 8) 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) dry-cli (1.0.0) dry-core (1.0.0) From 6f1ed786fab411e355ef0934772216a07e61acd7 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 5 Feb 2024 09:53:32 +0100 Subject: [PATCH 16/69] chore(bundle): remove elastic-apm, we don't use it anymore --- Gemfile | 1 - Gemfile.lock | 25 ++----------------------- config/elastic_apm.yml | 8 -------- config/env.example.optional | 6 ------ 4 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 config/elastic_apm.yml diff --git a/Gemfile b/Gemfile index 256c9f73c81..5d7596bb4a5 100644 --- a/Gemfile +++ b/Gemfile @@ -31,7 +31,6 @@ gem 'devise-two-factor' gem 'discard' gem 'dotenv-rails', require: 'dotenv/rails-now' # dotenv should always be loaded before rails gem 'dry-monads' -gem 'elastic-apm' gem 'flipper' gem 'flipper-active_record' gem 'flipper-ui' diff --git a/Gemfile.lock b/Gemfile.lock index b060dc4a70a..3e3439bba3d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -212,8 +212,7 @@ GEM diff-lcs (1.5.0) discard (1.3.0) activerecord (>= 4.2, < 8) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) + domain_name (0.6.20240107) dotenv (2.8.1) dotenv-rails (2.8.1) dotenv (= 2.8.1) @@ -230,10 +229,6 @@ GEM dumb_delegator (1.0.0) ecma-re-validator (0.3.0) regexp_parser (~> 2.0) - elastic-apm (4.6.0) - concurrent-ruby (~> 1.0) - http (>= 3.0) - ruby2_keywords erubi (1.12.0) et-orbi (1.2.4) tzinfo @@ -243,9 +238,6 @@ GEM factory_bot (6.1.0) activesupport (>= 5.0.0) ffi (1.16.3) - ffi-compiler (1.0.1) - ffi (>= 1.0.0) - rake flipper (1.0.0) brow (~> 0.4.1) concurrent-ruby (< 2) @@ -320,15 +312,9 @@ GEM highline (2.0.3) html_tokenizer (0.0.7) htmlentities (4.3.4) - http (5.1.1) - addressable (~> 2.8) - http-cookie (~> 1.0) - http-form_data (~> 2.2) - llhttp-ffi (~> 0.4.0) http-accept (1.7.0) - http-cookie (1.0.3) + http-cookie (1.0.5) domain_name (~> 0.5) - http-form_data (2.3.0) http_accept_language (2.1.1) httpclient (2.8.3) i18n (1.14.1) @@ -401,9 +387,6 @@ GEM listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - llhttp-ffi (0.4.0) - ffi-compiler (~> 1.0) - rake (~> 13.0) lograge (0.11.2) actionpack (>= 4) activesupport (>= 4) @@ -759,9 +742,6 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) ulid-ruby (1.0.2) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.7) unicode-display_width (2.4.2) uri_template (0.7.0) validate_email (0.1.6) @@ -860,7 +840,6 @@ DEPENDENCIES discard dotenv-rails dry-monads - elastic-apm factory_bot flipper flipper-active_record diff --git a/config/elastic_apm.yml b/config/elastic_apm.yml deleted file mode 100644 index 2c65bac6b8a..00000000000 --- a/config/elastic_apm.yml +++ /dev/null @@ -1,8 +0,0 @@ -# Set options ELASTIC_APM_SERVER_URL & ELASTIC_APM_SECRET_TOKEN by env vars instead -# See https://www.elastic.co/guide/en/apm/agent/ruby/current/configuration.html -# -# server_url: '' -# secret_token: '' - -# Enable it with ELASTIC_APM_ENABLED="true" -enabled: false diff --git a/config/env.example.optional b/config/env.example.optional index c3c7bac7cb8..1193625c33d 100644 --- a/config/env.example.optional +++ b/config/env.example.optional @@ -190,12 +190,6 @@ SIB_WEBHOOK_URL="" # ServicesPublics+ tracking url shown to user when dossier is terminated. SERVICES_PUBLICS_PLUS_URL="" -# Elasticsearch APM -# send application logs to elasticsearch APM component via elastic-apm gem -# see https://www.elastic.co/guide/en/apm/agent/ruby/current/configuration.html for more configuration options and vars -ELASTIC_APM_ENABLED="" # disabled by default, set to "true" to enable -ELASTIC_APM_SERVER_URL="http://192.168.0.1:8200" # elasticsearch APM endpoint URL - # Classic SMTP CLASSIC_SMTP_ENABLED="disabled" SMTP_HOST="" From 76ed099947d0cc35e0ba81bc60a9c06f5e32b6db Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:08:32 +0100 Subject: [PATCH 17/69] chore(bundle): Update factory_bot from 6.1.0 to 6.4.6 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3e3439bba3d..b4832b84e9f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -235,7 +235,7 @@ GEM ethon (0.15.0) ffi (>= 1.15.0) excon (0.102.0) - factory_bot (6.1.0) + factory_bot (6.4.6) activesupport (>= 5.0.0) ffi (1.16.3) flipper (1.0.0) From 0a137e58bc4b9bd238a36df5c8115c6f4b9b605f Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:08:46 +0100 Subject: [PATCH 18/69] chore(bundle): Update fugit from 1.4.2 to 1.9.0 --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b4832b84e9f..1b97ae29a3a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -230,7 +230,7 @@ GEM ecma-re-validator (0.3.0) regexp_parser (~> 2.0) erubi (1.12.0) - et-orbi (1.2.4) + et-orbi (1.2.7) tzinfo ethon (0.15.0) ffi (>= 1.15.0) @@ -262,8 +262,8 @@ GEM fog-core (~> 2.1) fog-json (>= 1.0) formatador (1.1.0) - fugit (1.4.2) - et-orbi (~> 1.1, >= 1.1.8) + fugit (1.9.0) + et-orbi (~> 1, >= 1.2.7) raabro (~> 1.4) geo_coord (0.2.0) geocoder (1.8.2) From f859f8d4a2dc0770547d2c428cf881514ff15976 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:08:50 +0100 Subject: [PATCH 19/69] chore(bundle): Update graphql from 2.0.24 to 2.2.7 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1b97ae29a3a..a20c319a2a8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -274,7 +274,7 @@ GEM i18n (>= 0.7) multi_json request_store (>= 1.0) - graphql (2.0.24) + graphql (2.2.7) graphql-batch (0.5.1) graphql (>= 1.10, < 3) promise.rb (~> 0.7.2) From fe163a1bd6a7966330bbf527ec63e39920705986 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:08:55 +0100 Subject: [PATCH 20/69] chore(bundle): Update graphql-batch from 0.5.1 to 0.5.3 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a20c319a2a8..cc229226990 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -275,8 +275,8 @@ GEM multi_json request_store (>= 1.0) graphql (2.2.7) - graphql-batch (0.5.1) - graphql (>= 1.10, < 3) + graphql-batch (0.5.3) + graphql (>= 1.12.18, < 3) promise.rb (~> 0.7.2) graphql-rails_logger (1.2.3) actionpack (> 5.0) From e045738be99d0de9ec38d1073353e5083103f293 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:08:59 +0100 Subject: [PATCH 21/69] chore(bundle): Update graphql-rails_logger from 1.2.3 to 1.2.4 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index cc229226990..b94d35df1ab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -278,7 +278,7 @@ GEM graphql-batch (0.5.3) graphql (>= 1.12.18, < 3) promise.rb (~> 0.7.2) - graphql-rails_logger (1.2.3) + graphql-rails_logger (1.2.4) actionpack (> 5.0) activesupport (> 5.0) railties (> 5.0) From 5d9eb5159ae9c8ac970b3e259a1609c040dec040 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:09:04 +0100 Subject: [PATCH 22/69] chore(bundle): Update graphql-schema_comparator from 1.1.2 to 1.2.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b94d35df1ab..511d8fa2959 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -283,7 +283,7 @@ GEM activesupport (> 5.0) railties (> 5.0) rouge (~> 3.0) - graphql-schema_comparator (1.1.2) + graphql-schema_comparator (1.2.1) bundler (>= 1.14) graphql (>= 1.10, < 3.0) thor (>= 0.19, < 2.0) From 97d1be2a1e9303044beb9b1fdae7e481c30f602a Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:09:08 +0100 Subject: [PATCH 23/69] chore(bundle): Update hashie from 4.1.0 to 5.0.0 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 511d8fa2959..77199d8faea 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -308,7 +308,7 @@ GEM sysexits (~> 1.1) hana (1.3.7) hashdiff (1.0.1) - hashie (4.1.0) + hashie (5.0.0) highline (2.0.3) html_tokenizer (0.0.7) htmlentities (4.3.4) From eb1411d0bbb216363fcd49dca196adbfe0504099 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:09:13 +0100 Subject: [PATCH 24/69] chore(bundle): Update i18n-tasks from 1.0.9 to 1.0.13 --- Gemfile.lock | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 77199d8faea..d3e4b1a0ec0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -130,12 +130,11 @@ GEM caxlsx (>= 2.0.2) bcrypt (3.1.20) benchmark-ips (2.13.0) - better_html (1.0.16) - actionview (>= 4.0) - activesupport (>= 4.0) + better_html (2.0.2) + actionview (>= 6.0) + activesupport (>= 6.0) ast (~> 2.0) erubi (~> 1.4) - html_tokenizer (~> 0.0.6) parser (>= 2.4) smart_properties bindata (2.4.10) @@ -309,8 +308,7 @@ GEM hana (1.3.7) hashdiff (1.0.1) hashie (5.0.0) - highline (2.0.3) - html_tokenizer (0.0.7) + highline (3.0.1) htmlentities (4.3.4) http-accept (1.7.0) http-cookie (1.0.5) @@ -319,14 +317,14 @@ GEM httpclient (2.8.3) i18n (1.14.1) concurrent-ruby (~> 1.0) - i18n-tasks (1.0.9) + i18n-tasks (1.0.13) activesupport (>= 4.0.2) ast (>= 2.1.0) - better_html (~> 1.0) + better_html (>= 1.0, < 3.0) erubi highline (>= 2.0.0) i18n - parser (>= 2.2.3.0) + parser (>= 3.2.2.1) rails-i18n rainbow (>= 2.2.2, < 4.0) terminal-table (>= 1.5.1) @@ -457,7 +455,7 @@ GEM orm_adapter (0.5.0) parallel (1.23.0) parsby (1.1.1) - parser (3.3.0.2) + parser (3.3.0.5) ast (~> 2.4.1) racc pdf-core (0.9.0) @@ -539,7 +537,7 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - rails-i18n (7.0.3) + rails-i18n (7.0.8) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) railties (7.0.8) @@ -742,7 +740,7 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) ulid-ruby (1.0.2) - unicode-display_width (2.4.2) + unicode-display_width (2.5.0) uri_template (0.7.0) validate_email (0.1.6) activemodel (>= 3.0) From 95b980c0613172a1b3366660c4d393b4dae8d119 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:09:22 +0100 Subject: [PATCH 25/69] chore(bundle): Update iban-tools from 1.1.0 to 1.2.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d3e4b1a0ec0..a4b14ee2ee6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -329,7 +329,7 @@ GEM rainbow (>= 2.2.2, < 4.0) terminal-table (>= 1.5.1) i18n_data (0.13.0) - iban-tools (1.1.0) + iban-tools (1.2.1) ice_nine (0.11.2) image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) From feb148437e01528ffd35e63ec981a64524c1f4c2 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:09:27 +0100 Subject: [PATCH 26/69] chore(bundle): Update invisible_captcha from 2.0.0 to 2.1.0 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a4b14ee2ee6..65fd92651ab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -334,8 +334,8 @@ GEM image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) - invisible_captcha (2.0.0) - rails (>= 5.0) + invisible_captcha (2.1.0) + rails (>= 5.2) io-console (0.7.1) irb (1.11.0) rdoc From c80068bd187c75ff0d17f362ac86d037c9948501 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:09:31 +0100 Subject: [PATCH 27/69] chore(bundle): Update irb from 1.11.0 to 1.11.1 --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 65fd92651ab..ddfc1ef01f7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -336,10 +336,10 @@ GEM ruby-vips (>= 2.0.17, < 3) invisible_captcha (2.1.0) rails (>= 5.2) - io-console (0.7.1) - irb (1.11.0) + io-console (0.7.2) + irb (1.11.1) rdoc - reline (>= 0.3.8) + reline (>= 0.4.2) job-iteration (1.4.1) activejob (>= 5.2) jquery-rails (4.6.0) From 3f2d266112a95e495c9e22b7ec5d580809bb4a11 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:09:41 +0100 Subject: [PATCH 28/69] chore(bundle): Update jwt from 2.3.0 to 2.7.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index ddfc1ef01f7..1ce246eff41 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -357,7 +357,7 @@ GEM regexp_parser (~> 2.0) uri_template (~> 0.7) jsonapi-renderer (0.2.2) - jwt (2.3.0) + jwt (2.7.1) kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) From dcf0b0d399b89d25c1d565d569326860ff651308 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:09:46 +0100 Subject: [PATCH 29/69] chore(bundle): Update launchy from 2.5.0 to 2.5.2 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1ce246eff41..561ca7bc9f1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -374,8 +374,8 @@ GEM activemodel (>= 6.0.0) activesupport (>= 6.0.0) redis (>= 4.2, < 6) - launchy (2.5.0) - addressable (~> 2.7) + launchy (2.5.2) + addressable (~> 2.8) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (1.4.0) From 4e80ed68e5c9a43c4264c75e9fddffa27b008a31 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:09:50 +0100 Subject: [PATCH 30/69] chore(bundle): Update letter_opener_web from 1.4.0 to 2.0.0 --- Gemfile.lock | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 561ca7bc9f1..9770762f63b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -376,12 +376,13 @@ GEM redis (>= 4.2, < 6) launchy (2.5.2) addressable (~> 2.8) - letter_opener (1.7.0) - launchy (~> 2.2) - letter_opener_web (1.4.0) - actionmailer (>= 3.2) - letter_opener (~> 1.0) - railties (>= 3.2) + letter_opener (1.8.1) + launchy (>= 2.2, < 3) + letter_opener_web (2.0.0) + actionmailer (>= 5.2) + letter_opener (~> 1.7) + railties (>= 5.2) + rexml listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) From 3e4b08b623a252a124bb47618c22e3b318c11e12 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:09:54 +0100 Subject: [PATCH 31/69] chore(bundle): Update lograge from 0.11.2 to 0.14.0 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9770762f63b..a7736ae549c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -386,7 +386,7 @@ GEM listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - lograge (0.11.2) + lograge (0.14.0) actionpack (>= 4) activesupport (>= 4) railties (>= 4) @@ -564,7 +564,7 @@ GEM regexp_parser (2.9.0) reline (0.4.2) io-console (~> 0.5) - request_store (1.5.0) + request_store (1.5.1) rack (>= 1.4) responders (3.1.1) actionpack (>= 5.2) From dc4365f74c48dc3653e387b9d70a70d8d63334ab Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:09:59 +0100 Subject: [PATCH 32/69] chore(bundle): Update mailjet from 1.6.0 to 1.7.3 --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a7736ae549c..a239d4962c8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -400,7 +400,7 @@ GEM net-imap net-pop net-smtp - mailjet (1.6.0) + mailjet (1.7.3) activesupport (>= 3.1.0) rack (>= 1.4.0) rest-client (>= 2.0.0) @@ -414,9 +414,9 @@ GEM matrix (0.4.2) memory_profiler (1.0.0) method_source (1.0.0) - mime-types (3.5.1) + mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2023.0808) + mime-types-data (3.2023.1205) mina (1.2.4) open4 (~> 1.3.4) rake From ec65849286cb7da7f6fd3e3ae0def8d935f4b60e Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:10:04 +0100 Subject: [PATCH 33/69] chore(bundle): Update maintenance_tasks from 2.3.2 to 2.4.0 --- Gemfile.lock | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index a239d4962c8..95b7d40f143 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -404,12 +404,13 @@ GEM activesupport (>= 3.1.0) rack (>= 1.4.0) rest-client (>= 2.0.0) - maintenance_tasks (2.3.2) + maintenance_tasks (2.4.0) actionpack (>= 6.0) activejob (>= 6.0) activerecord (>= 6.0) job-iteration (>= 1.3.6) railties (>= 6.0) + zeitwerk (>= 2.6.2) marcel (1.0.2) matrix (0.4.2) memory_profiler (1.0.0) From e32005cf7088d2c61141b69c7a4036d9797419e6 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:10:08 +0100 Subject: [PATCH 34/69] chore(bundle): Update memory_profiler from 1.0.0 to 1.0.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 95b7d40f143..3ac94e55161 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -413,7 +413,7 @@ GEM zeitwerk (>= 2.6.2) marcel (1.0.2) matrix (0.4.2) - memory_profiler (1.0.0) + memory_profiler (1.0.1) method_source (1.0.0) mime-types (3.5.2) mime-types-data (~> 3.2015) From 8f3aeba578d9411a78cfc5e39ba7e0997f3af8e5 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:10:13 +0100 Subject: [PATCH 35/69] chore(bundle): Update mina from 1.2.4 to 1.2.5 --- Gemfile.lock | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3ac94e55161..d74fd7c6318 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -418,8 +418,7 @@ GEM mime-types (3.5.2) mime-types-data (~> 3.2015) mime-types-data (3.2023.1205) - mina (1.2.4) - open4 (~> 1.3.4) + mina (1.2.5) rake mini_magick (4.11.0) mini_mime (1.1.5) @@ -443,7 +442,6 @@ GEM nokogiri (1.16.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) - open4 (1.3.4) openid_connect (1.3.0) activemodel attr_required (>= 1.0.0) From 406a7ee46545bae9ee1f918803813eda6563f1fa Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:10:17 +0100 Subject: [PATCH 36/69] chore(bundle): Update mini_magick from 4.11.0 to 4.12.0 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d74fd7c6318..dcad1b21e6a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -420,7 +420,7 @@ GEM mime-types-data (3.2023.1205) mina (1.2.5) rake - mini_magick (4.11.0) + mini_magick (4.12.0) mini_mime (1.1.5) mini_portile2 (2.8.5) minitest (5.21.2) From c8086a6defaeb52dd46ea44ec05a1edf5284811b Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:10:31 +0100 Subject: [PATCH 37/69] chore(bundle): Update pg from 1.4.6 to 1.5.4 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index dcad1b21e6a..2a0811032d8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -459,7 +459,7 @@ GEM ast (~> 2.4.1) racc pdf-core (0.9.0) - pg (1.4.6) + pg (1.5.4) phonelib (0.6.53) prawn (2.4.0) pdf-core (~> 0.9.0) From a1f9ea36f6a2ed89f3b6bf1057766733fc083c70 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:10:36 +0100 Subject: [PATCH 38/69] chore(bundle): Update phonelib from 0.6.53 to 0.8.7 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2a0811032d8..697778aa932 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -460,7 +460,7 @@ GEM racc pdf-core (0.9.0) pg (1.5.4) - phonelib (0.6.53) + phonelib (0.8.7) prawn (2.4.0) pdf-core (~> 0.9.0) ttfunk (~> 1.7) From 40d8da1783f09af8b1d63683254c0e483023f8a0 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:10:41 +0100 Subject: [PATCH 39/69] chore(bundle): Update prawn-rails from 1.3.0 to 1.4.2 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 697778aa932..a14a7a589a5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -464,10 +464,10 @@ GEM prawn (2.4.0) pdf-core (~> 0.9.0) ttfunk (~> 1.7) - prawn-rails (1.3.0) + prawn-rails (1.4.2) + actionview (>= 3.1.0) prawn prawn-table - rails (>= 3.1.0) prawn-table (0.2.2) prawn (>= 1.3.0, < 3.0.0) premailer (1.22.0) From f4c64f7a10b5e9d62269cc8f2593ace94fc3b3c5 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:10:45 +0100 Subject: [PATCH 40/69] chore(bundle): Update premailer-rails from 1.11.1 to 1.12.0 --- Gemfile.lock | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index a14a7a589a5..18274f47a02 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -474,8 +474,9 @@ GEM addressable css_parser (>= 1.12.0) htmlentities (>= 4.0.0) - premailer-rails (1.11.1) + premailer-rails (1.12.0) actionmailer (>= 3) + net-smtp premailer (~> 1.7, >= 1.7.9) promise.rb (0.7.4) psych (5.1.2) From 943629431a3152370f583d05e347126642fc04ec Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:10:50 +0100 Subject: [PATCH 41/69] chore(bundle): Update pundit from 2.2.0 to 2.3.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 18274f47a02..4461a0348b8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -484,7 +484,7 @@ GEM public_suffix (5.0.4) puma (6.4.2) nio4r (~> 2.0) - pundit (2.2.0) + pundit (2.3.1) activesupport (>= 3.0.0) raabro (1.4.0) racc (1.7.3) From 22f1b23422e0013157139fe17b878794df3780e6 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:10:54 +0100 Subject: [PATCH 42/69] chore(bundle): Update rack-attack from 6.5.0 to 6.7.0 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4461a0348b8..ce49aa466e0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -489,8 +489,8 @@ GEM raabro (1.4.0) racc (1.7.3) rack (2.2.8) - rack-attack (6.5.0) - rack (>= 1.0, < 3) + rack-attack (6.7.0) + rack (>= 1.0, < 4) rack-mini-profiler (3.0.0) rack (>= 1.2.0) rack-oauth2 (1.19.0) From 4bb8ff66d670632a6d124d9c2e9bfb96910b1c67 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:10:59 +0100 Subject: [PATCH 43/69] chore(bundle): Update rack-mini-profiler from 3.0.0 to 3.3.0 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index ce49aa466e0..43a514b0f89 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -491,7 +491,7 @@ GEM rack (2.2.8) rack-attack (6.7.0) rack (>= 1.0, < 4) - rack-mini-profiler (3.0.0) + rack-mini-profiler (3.3.0) rack (>= 1.2.0) rack-oauth2 (1.19.0) activesupport From e317a375bf967d963b0cae5e0b6b937236ec1ec8 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:11:04 +0100 Subject: [PATCH 44/69] chore(bundle): Update rails-erd from 1.6.1 to 1.7.2 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 43a514b0f89..db99d901983 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -530,7 +530,7 @@ GEM activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-erd (1.6.1) + rails-erd (1.7.2) activerecord (>= 4.2) activesupport (>= 4.2) choice (~> 0.2.0) From 879ed6e8f9b5b0272a2de415bc58549bb8f57ea9 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:11:11 +0100 Subject: [PATCH 45/69] chore(bundle): Update redis from 5.0.6 to 5.0.8 --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index db99d901983..3ab3c151171 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -557,9 +557,9 @@ GEM rdoc (6.6.2) psych (>= 4.0.0) redcarpet (3.6.0) - redis (5.0.6) - redis-client (>= 0.9.0) - redis-client (0.18.0) + redis (5.0.8) + redis-client (>= 0.17.0) + redis-client (0.19.1) connection_pool regexp_parser (2.9.0) reline (0.4.2) From aaa351a06980722d010425730d62d6775326795f Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:11:16 +0100 Subject: [PATCH 46/69] chore(bundle): Update rqrcode from 1.2.0 to 2.2.0 --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3ab3c151171..c1a1f8032c1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -581,10 +581,10 @@ GEM rubyzip (>= 1.0) rotp (6.2.2) rouge (3.30.0) - rqrcode (1.2.0) + rqrcode (2.2.0) chunky_png (~> 1.0) - rqrcode_core (~> 0.2) - rqrcode_core (0.2.0) + rqrcode_core (~> 1.0) + rqrcode_core (1.2.0) rspec-core (3.12.2) rspec-support (~> 3.12.0) rspec-expectations (3.12.3) From 62a4e3e41c976ee7da44101338f3c556528adcc1 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:11:20 +0100 Subject: [PATCH 47/69] chore(bundle): Update rspec-rails from 6.0.1 to 6.1.1 --- Gemfile.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c1a1f8032c1..79f9038495c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -590,20 +590,20 @@ GEM rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-mocks (3.12.5) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-rails (6.0.1) + rspec-rails (6.1.1) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) - rspec-core (~> 3.11) - rspec-expectations (~> 3.11) - rspec-mocks (~> 3.11) - rspec-support (~> 3.11) + rspec-core (~> 3.12) + rspec-expectations (~> 3.12) + rspec-mocks (~> 3.12) + rspec-support (~> 3.12) rspec-retry (0.6.2) rspec-core (> 3.3) - rspec-support (3.12.0) + rspec-support (3.12.1) rspec_junit_formatter (0.4.1) rspec-core (>= 2, < 4, != 2.12.0) rubocop (1.50.2) From 2bbd74003cd5b5a94d79653ad4e7f4d1c40a9397 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:11:25 +0100 Subject: [PATCH 48/69] chore(bundle): Update rspec_junit_formatter from 0.4.1 to 0.6.0 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 79f9038495c..ef58f2abc09 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -604,7 +604,7 @@ GEM rspec-retry (0.6.2) rspec-core (> 3.3) rspec-support (3.12.1) - rspec_junit_formatter (0.4.1) + rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) rubocop (1.50.2) json (~> 2.3) From fe0d2a09cc8a3842102b1a6ef0421d0fff0bbf56 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 5 Feb 2024 10:35:30 +0100 Subject: [PATCH 49/69] chore(bundle): Update rspec from 3.12.2 to 3.13.0 --- Gemfile.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ef58f2abc09..90325c25a4a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -208,7 +208,7 @@ GEM devise (~> 4.0) railties (~> 7.0) rotp (~> 6.0) - diff-lcs (1.5.0) + diff-lcs (1.5.1) discard (1.3.0) activerecord (>= 4.2, < 8) domain_name (0.6.20240107) @@ -585,14 +585,14 @@ GEM chunky_png (~> 1.0) rqrcode_core (~> 1.0) rqrcode_core (1.2.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.6) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) + rspec-support (~> 3.13.0) rspec-rails (6.1.1) actionpack (>= 6.1) activesupport (>= 6.1) @@ -603,7 +603,7 @@ GEM rspec-support (~> 3.12) rspec-retry (0.6.2) rspec-core (> 3.3) - rspec-support (3.12.1) + rspec-support (3.13.0) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) rubocop (1.50.2) From f5566b7b37cefbb3df71c11dd5477fe4ceac39bb Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:11:30 +0100 Subject: [PATCH 50/69] chore(bundle): Update rubocop from 1.50.2 to 1.60.2 --- Gemfile.lock | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 90325c25a4a..b2c4f481045 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -346,7 +346,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.5.1) + json (2.7.1) json-jwt (1.13.0) activesupport (>= 4.2) aes_key_wrap @@ -374,6 +374,7 @@ GEM activemodel (>= 6.0.0) activesupport (>= 6.0.0) redis (>= 4.2, < 6) + language_server-protocol (3.17.0.3) launchy (2.5.2) addressable (~> 2.8) letter_opener (1.8.1) @@ -453,7 +454,7 @@ GEM validate_url webfinger (>= 1.0.1) orm_adapter (0.5.0) - parallel (1.23.0) + parallel (1.24.0) parsby (1.1.1) parser (3.3.0.5) ast (~> 2.4.1) @@ -606,17 +607,18 @@ GEM rspec-support (3.13.0) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.50.2) + rubocop (1.60.2) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.0.0) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.0, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.28.0) + rubocop-ast (1.30.0) parser (>= 3.2.1.0) rubocop-capybara (2.17.1) rubocop (~> 1.41) From 8eef93193a3d0898142eebb4f588cba61e4411e0 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:11:34 +0100 Subject: [PATCH 51/69] chore(bundle): Update rubocop-performance from 1.17.1 to 1.20.2 --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b2c4f481045..b2fcd27e302 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -622,9 +622,9 @@ GEM parser (>= 3.2.1.0) rubocop-capybara (2.17.1) rubocop (~> 1.41) - rubocop-performance (1.17.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) + rubocop-performance (1.20.2) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) rubocop-rails (2.19.1) activesupport (>= 4.2.0) rack (>= 1.1) From f2d34fb5d7a911d80c368af0bc6256a74e149141 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:11:39 +0100 Subject: [PATCH 52/69] chore(bundle): Update rubocop-rails from 2.19.1 to 2.23.1 --- Gemfile.lock | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b2fcd27e302..a09b0958a11 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -625,10 +625,11 @@ GEM rubocop-performance (1.20.2) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rails (2.19.1) + rubocop-rails (2.23.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) rubocop-rspec (2.20.0) rubocop (~> 1.33) rubocop-capybara (~> 2.17) From 4abc8c4d4d317106f289e2193f2d6b6edcfede42 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:11:43 +0100 Subject: [PATCH 53/69] chore(bundle): Update rubocop-rspec from 2.20.0 to 2.26.1 --- Gemfile.lock | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a09b0958a11..c63b757750c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -620,7 +620,9 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.30.0) parser (>= 3.2.1.0) - rubocop-capybara (2.17.1) + rubocop-capybara (2.20.0) + rubocop (~> 1.41) + rubocop-factory_bot (2.25.1) rubocop (~> 1.41) rubocop-performance (1.20.2) rubocop (>= 1.48.1, < 2.0) @@ -630,9 +632,10 @@ GEM rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rspec (2.20.0) - rubocop (~> 1.33) + rubocop-rspec (2.26.1) + rubocop (~> 1.40) rubocop-capybara (~> 2.17) + rubocop-factory_bot (~> 2.22) ruby-graphviz (1.2.5) rexml ruby-progressbar (1.13.0) From b9b85a3efe6820cb7845a2491fe4c1a89ea35bd8 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:11:48 +0100 Subject: [PATCH 54/69] chore(bundle): Update saml_idp from 0.14.0 to 0.16.0 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c63b757750c..73772da46c2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -643,7 +643,7 @@ GEM ffi (~> 1.12) ruby2_keywords (0.0.5) rubyzip (2.3.2) - saml_idp (0.14.0) + saml_idp (0.16.0) activesupport (>= 5.2) builder (>= 3.0) nokogiri (>= 1.6.2) From 0845608175e1782e264bba0348a09d1dd7b70eb9 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:11:53 +0100 Subject: [PATCH 55/69] chore(bundle): Update selenium-devtools from 0.114.0 to 0.121.0 --- Gemfile.lock | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 73772da46c2..3b64db8b05c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -128,6 +128,7 @@ GEM axlsx_styler (1.1.0) activesupport (>= 3.1) caxlsx (>= 2.0.2) + base64 (0.2.0) bcrypt (3.1.20) benchmark-ips (2.13.0) better_html (2.0.2) @@ -668,9 +669,10 @@ GEM scss_lint (0.60.0) sass (~> 3.5, >= 3.5.5) selectize-rails (0.12.6) - selenium-devtools (0.114.0) + selenium-devtools (0.121.0) selenium-webdriver (~> 4.2) - selenium-webdriver (4.13.1) + selenium-webdriver (4.17.0) + base64 (~> 0.2) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) From 121054c4ec2c318909e6dfb18f0aa1ff4e08463a Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 29 Jan 2024 22:12:14 +0100 Subject: [PATCH 56/69] chore(bundle): Update shoulda-matchers from 4.5.1 to 6.1.0 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3b64db8b05c..55d35a5e9c4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -687,8 +687,8 @@ GEM sentry-sidekiq (5.9.0) sentry-ruby (~> 5.9.0) sidekiq (>= 3.0) - shoulda-matchers (4.5.1) - activesupport (>= 4.2.0) + shoulda-matchers (6.1.0) + activesupport (>= 5.2.0) sib-api-v3-sdk (7.4.0) json (~> 2.1, >= 2.1.0) typhoeus (~> 1.0, >= 1.0.1) From b2db660606305a2f67a2cb48c0a3622db5063170 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 5 Feb 2024 10:33:10 +0100 Subject: [PATCH 57/69] chore(bundle): Update haml from 6.0.12 to 6.3.0 and haml_lint --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 55d35a5e9c4..b4121a8d3ab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -289,7 +289,7 @@ GEM thor (>= 0.19, < 2.0) groupdate (6.4.0) activesupport (>= 6.1) - haml (6.0.5) + haml (6.3.0) temple (>= 0.8.2) thor tilt @@ -300,11 +300,11 @@ GEM activesupport (>= 5.1) haml (>= 4.0.6) railties (>= 5.1) - haml_lint (0.42.0) - haml (>= 4.0, < 6.1) + haml_lint (0.56.0) + haml (>= 5.0) parallel (~> 1.10) rainbow - rubocop (>= 0.50.0) + rubocop (>= 1.0) sysexits (~> 1.1) hana (1.3.7) hashdiff (1.0.1) From e85e0263617ac1aaec549bb00897e436b3afed04 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 5 Feb 2024 11:08:28 +0100 Subject: [PATCH 58/69] fix: phonelib multiple default countries --- config/initializers/phonelib.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/phonelib.rb b/config/initializers/phonelib.rb index f76a2d4416e..53bd470d870 100644 --- a/config/initializers/phonelib.rb +++ b/config/initializers/phonelib.rb @@ -1,2 +1,2 @@ -Phonelib.default_country = "FR" +Phonelib.default_country = ["FR"] Phonelib.parse_special = true From 0da2843f2611dd2a7d9583c4878536f75ca9b3a4 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 5 Feb 2024 11:20:55 +0100 Subject: [PATCH 59/69] fix(rubocop): Rails/FindEach --- .rubocop.yml | 2 ++ .../cron/administrateur_activate_before_expiration_job.rb | 2 +- app/jobs/migrations/batch_update_datetime_values_job.rb | 2 +- db/migrate/20221006193737_backfill_procedures_zones.rb | 4 ++-- ...118142539_backfill_experts_procedure_id_on_avis_table.rake | 2 +- lib/tasks/support.rake | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index a999a79d2ab..40984b5dc4c 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -803,6 +803,8 @@ Rails/FindById: Rails/FindEach: Enabled: true + Exclude: + - spec/**/* Rails/FreezeTime: Enabled: true diff --git a/app/jobs/cron/administrateur_activate_before_expiration_job.rb b/app/jobs/cron/administrateur_activate_before_expiration_job.rb index 4c5c518e828..0c5779e1677 100644 --- a/app/jobs/cron/administrateur_activate_before_expiration_job.rb +++ b/app/jobs/cron/administrateur_activate_before_expiration_job.rb @@ -6,6 +6,6 @@ def perform(*args) .includes(:user) .inactive .where(created_at: 3.days.ago.all_day) - .each { |a| a.user.remind_invitation! } + .find_each { |a| a.user.remind_invitation! } end end diff --git a/app/jobs/migrations/batch_update_datetime_values_job.rb b/app/jobs/migrations/batch_update_datetime_values_job.rb index 3818a3b58b2..5ef4207aa1e 100644 --- a/app/jobs/migrations/batch_update_datetime_values_job.rb +++ b/app/jobs/migrations/batch_update_datetime_values_job.rb @@ -1,6 +1,6 @@ class Migrations::BatchUpdateDatetimeValuesJob < ApplicationJob def perform(ids) - Champs::DatetimeChamp.where(id: ids).each do |datetime_champ| + Champs::DatetimeChamp.where(id: ids).find_each do |datetime_champ| current_value_in_time = Time.zone.parse(datetime_champ.value) if current_value_in_time.present? diff --git a/db/migrate/20221006193737_backfill_procedures_zones.rb b/db/migrate/20221006193737_backfill_procedures_zones.rb index 9564cb51b86..fbb2987fbc4 100644 --- a/db/migrate/20221006193737_backfill_procedures_zones.rb +++ b/db/migrate/20221006193737_backfill_procedures_zones.rb @@ -1,7 +1,7 @@ class BackfillProceduresZones < ActiveRecord::Migration[6.1] def up # rubocop:disable DS/Unscoped - Procedure.unscoped.each do |procedure| + Procedure.unscoped.find_each do |procedure| procedure.zones << procedure.zone if procedure.zone end # rubocop:enable DS/Unscoped @@ -9,7 +9,7 @@ def up def down # rubocop:disable DS/Unscoped - Procedure.unscoped.each do |procedure| + Procedure.unscoped.find_each do |procedure| procedure.zones.destroy_all end # rubocop:enable DS/Unscoped diff --git a/lib/tasks/deployment/20210118142539_backfill_experts_procedure_id_on_avis_table.rake b/lib/tasks/deployment/20210118142539_backfill_experts_procedure_id_on_avis_table.rake index 8d33500f37c..281c4bb0499 100644 --- a/lib/tasks/deployment/20210118142539_backfill_experts_procedure_id_on_avis_table.rake +++ b/lib/tasks/deployment/20210118142539_backfill_experts_procedure_id_on_avis_table.rake @@ -20,7 +20,7 @@ namespace :after_party do user.reload # rubocop:enable DS/Unscoped # rubocop:enable Rails/PluckInWhere - Avis.where(claimant: instructeur).each do |avis| + Avis.where(claimant: instructeur).find_each do |avis| experts_procedure = ExpertsProcedure.find_or_create_by(expert: user.expert, procedure: avis.procedure) avis.update_column(:experts_procedure_id, experts_procedure.id) end diff --git a/lib/tasks/support.rake b/lib/tasks/support.rake index add80e5d595..ff712c1cf44 100644 --- a/lib/tasks/support.rake +++ b/lib/tasks/support.rake @@ -28,7 +28,7 @@ namespace :support do fail "Must specify a USER_EMAIL" if user_email.nil? administrateur = Administrateur.joins(:user).where(user: { email: user_email }).first - AdministrateursProcedure.where(administrateur: administrateur).each do |administrateur_procedure| + AdministrateursProcedure.where(administrateur: administrateur).find_each do |administrateur_procedure| procedure = administrateur_procedure.procedure if procedure.administrateurs.count > 1 begin From 6ab3fa1cf4fbc8dc8c71724b29a42015e0dba2c1 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 5 Feb 2024 11:35:01 +0100 Subject: [PATCH 60/69] fix(rubocop): Rails/RedundantActiveRecordAllMethod --- app/controllers/manager/outdated_procedures_controller.rb | 4 ++-- app/models/procedure_revision_preloader.rb | 2 +- db/migrate/20220725070026_cleanup_assign_tos_from_betagouv.rb | 2 +- ...eadd_super_admin_to_their_procedure_without_instructeur.rb | 2 +- .../20230131132616_fix_dossier_transfer_with_uppercase.rake | 2 +- lib/tasks/superadmin.rake | 2 +- .../gestionnaires/groupe_gestionnaires_controller_spec.rb | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/controllers/manager/outdated_procedures_controller.rb b/app/controllers/manager/outdated_procedures_controller.rb index d51752d681f..1d9e3c65021 100644 --- a/app/controllers/manager/outdated_procedures_controller.rb +++ b/app/controllers/manager/outdated_procedures_controller.rb @@ -2,8 +2,8 @@ module Manager class OutdatedProceduresController < Manager::ApplicationController def index @records_per_page = params[:records_per_page] || "10" - resources = Procedure.all - .where(procedure_expires_when_termine_enabled: false) + resources = Procedure. + where(procedure_expires_when_termine_enabled: false) .order(created_at: :asc) .page(params[:_page]) .per(@records_per_page) diff --git a/app/models/procedure_revision_preloader.rb b/app/models/procedure_revision_preloader.rb index 7109c186b99..bd85517ba3a 100644 --- a/app/models/procedure_revision_preloader.rb +++ b/app/models/procedure_revision_preloader.rb @@ -9,7 +9,7 @@ def all end def self.load_one(revision) - ProcedureRevisionPreloader.new([revision]).all.first + ProcedureRevisionPreloader.new([revision]).all.first # rubocop:disable Rails/RedundantActiveRecordAllMethod end private diff --git a/db/migrate/20220725070026_cleanup_assign_tos_from_betagouv.rb b/db/migrate/20220725070026_cleanup_assign_tos_from_betagouv.rb index e58878c3338..d8ea4dc9cac 100644 --- a/db/migrate/20220725070026_cleanup_assign_tos_from_betagouv.rb +++ b/db/migrate/20220725070026_cleanup_assign_tos_from_betagouv.rb @@ -1,6 +1,6 @@ class CleanupAssignTosFromBetagouv < ActiveRecord::Migration[6.1] def up - super_admin_emails = SuperAdmin.all.pluck(:email) + super_admin_emails = SuperAdmin.pluck(:email) super_admin_emails.each do |email| user = User.find_by(email: email) diff --git a/db/migrate/20220824114151_readd_super_admin_to_their_procedure_without_instructeur.rb b/db/migrate/20220824114151_readd_super_admin_to_their_procedure_without_instructeur.rb index 6d11b47632d..212fafdeae9 100644 --- a/db/migrate/20220824114151_readd_super_admin_to_their_procedure_without_instructeur.rb +++ b/db/migrate/20220824114151_readd_super_admin_to_their_procedure_without_instructeur.rb @@ -1,6 +1,6 @@ class ReaddSuperAdminToTheirProcedureWithoutInstructeur < ActiveRecord::Migration[6.1] def change - super_admin_emails = SuperAdmin.all.pluck(:email) + super_admin_emails = SuperAdmin.pluck(:email) # we want to re-assign each super admin being an admin of a procedure # to every procedure that lost all instructeur # so we cache procedure without instructeur first diff --git a/lib/tasks/deployment/20230131132616_fix_dossier_transfer_with_uppercase.rake b/lib/tasks/deployment/20230131132616_fix_dossier_transfer_with_uppercase.rake index 55db50e008c..ed89182c7c9 100644 --- a/lib/tasks/deployment/20230131132616_fix_dossier_transfer_with_uppercase.rake +++ b/lib/tasks/deployment/20230131132616_fix_dossier_transfer_with_uppercase.rake @@ -4,7 +4,7 @@ namespace :after_party do puts "Running deploy task 'fix_dossier_transfer_with_uppercase'" # in production, about 1000, no need to track progress - DossierTransfer.all.find_each do |dt| + DossierTransfer.find_each do |dt| if /A-Z/.match?(dt.email) dt.email = dt.email.downcase dt.save diff --git a/lib/tasks/superadmin.rake b/lib/tasks/superadmin.rake index 9579f3af49a..77cea63744a 100644 --- a/lib/tasks/superadmin.rake +++ b/lib/tasks/superadmin.rake @@ -6,7 +6,7 @@ namespace :superadmin do EOD task list: :environment do rake_puts "All SuperAdmins:" - SuperAdmin.all.pluck(:email).each do |a| + SuperAdmin.pluck(:email).each do |a| puts a end end diff --git a/spec/controllers/gestionnaires/groupe_gestionnaires_controller_spec.rb b/spec/controllers/gestionnaires/groupe_gestionnaires_controller_spec.rb index 7faee5eb4a0..9c11cb02d0d 100644 --- a/spec/controllers/gestionnaires/groupe_gestionnaires_controller_spec.rb +++ b/spec/controllers/gestionnaires/groupe_gestionnaires_controller_spec.rb @@ -123,7 +123,7 @@ it do subject - expect(GroupeGestionnaire.all.count).to eq(1) + expect(GroupeGestionnaire.count).to eq(1) expect(response).to redirect_to(gestionnaire_groupe_gestionnaires_path) end end From eeef6176b71752988c10377455d5ac2f21c7144c Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 5 Feb 2024 12:21:14 +0100 Subject: [PATCH 61/69] fix(rubocop): Rails/PluckInWhere --- app/controllers/users/dossiers_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/users/dossiers_controller.rb b/app/controllers/users/dossiers_controller.rb index ef416291eb2..dc0fcd9ed2c 100644 --- a/app/controllers/users/dossiers_controller.rb +++ b/app/controllers/users/dossiers_controller.rb @@ -58,7 +58,7 @@ def index @dossiers_traites = current_user.dossiers.state_termine.merge(@dossiers_visibles) @dossiers_invites = current_user.dossiers_invites.merge(@dossiers_visibles) @dossiers_supprimes_recemment = current_user.dossiers.hidden_by_user.merge(ordered_dossiers) - @dossier_transferes = @dossiers_visibles.where(dossier_transfer_id: DossierTransfer.for_email(current_user.email).ids) + @dossier_transferes = @dossiers_visibles.where(dossier_transfer_id: DossierTransfer.for_email(current_user.email)) @dossiers_close_to_expiration = current_user.dossiers.close_to_expiration.merge(@dossiers_visibles) @dossiers_supprimes_definitivement = deleted_dossiers From e0d5dc84d509424b525e4fa3ee4834e245012bc7 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 5 Feb 2024 12:23:15 +0100 Subject: [PATCH 62/69] fix(rubocop): Rails/TimeZone --- spec/system/users/list_dossiers_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/system/users/list_dossiers_spec.rb b/spec/system/users/list_dossiers_spec.rb index 779beef1989..39eb5261537 100644 --- a/spec/system/users/list_dossiers_spec.rb +++ b/spec/system/users/list_dossiers_spec.rb @@ -16,7 +16,7 @@ @default_per_page = Dossier.default_per_page Dossier.paginates_per dossiers_per_page - last_updated_dossier.update_column(:updated_at, "19/07/2052 15:35".to_time) + last_updated_dossier.update_column(:updated_at, Time.zone.parse("19/07/2052 15:35")) login_as user, scope: :user visit dossiers_path From e3f233cd518af5458ec1b69e5eb980923fcc2486 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 5 Feb 2024 12:24:03 +0100 Subject: [PATCH 63/69] fix(rubocop): Layout/ExtraSpacing et Layout/SpaceAroundOperators --- app/controllers/manager/outdated_procedures_controller.rb | 4 ++-- app/services/api_bretagne_service.rb | 2 +- app/services/archive_uploader.rb | 2 +- app/views/dossiers/dossier_vide.pdf.prawn | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/manager/outdated_procedures_controller.rb b/app/controllers/manager/outdated_procedures_controller.rb index 1d9e3c65021..336c956ce7d 100644 --- a/app/controllers/manager/outdated_procedures_controller.rb +++ b/app/controllers/manager/outdated_procedures_controller.rb @@ -2,8 +2,8 @@ module Manager class OutdatedProceduresController < Manager::ApplicationController def index @records_per_page = params[:records_per_page] || "10" - resources = Procedure. - where(procedure_expires_when_termine_enabled: false) + resources = Procedure + .where(procedure_expires_when_termine_enabled: false) .order(created_at: :asc) .page(params[:_page]) .per(@records_per_page) diff --git a/app/services/api_bretagne_service.rb b/app/services/api_bretagne_service.rb index b4d5ee5b741..1eb319c247e 100644 --- a/app/services/api_bretagne_service.rb +++ b/app/services/api_bretagne_service.rb @@ -45,7 +45,7 @@ def fetch_page(url:, params:, remaining_retry_count: 1) end in Success(body:) body - else # no response gives back a 204, so we don't try to JSON.parse(nil) to avoid error + else # no response gives back a 204, so we don't try to JSON.parse(nil) to avoid error { items: [] } end end diff --git a/app/services/archive_uploader.rb b/app/services/archive_uploader.rb index ee4563c296c..a1ad9023d7a 100644 --- a/app/services/archive_uploader.rb +++ b/app/services/archive_uploader.rb @@ -44,7 +44,7 @@ def upload_with_active_storage end def upload_with_chunking_wrapper - params = blob_default_params(filepath).merge(byte_size: File.size(filepath), + params = blob_default_params(filepath).merge(byte_size: File.size(filepath), checksum: Digest::SHA256.file(filepath).hexdigest) blob = ActiveStorage::Blob.create_before_direct_upload!(**params) if retryable_syscall_to_custom_uploader(blob) diff --git a/app/views/dossiers/dossier_vide.pdf.prawn b/app/views/dossiers/dossier_vide.pdf.prawn index 5dcad614d9d..5cc8863281e 100644 --- a/app/views/dossiers/dossier_vide.pdf.prawn +++ b/app/views/dossiers/dossier_vide.pdf.prawn @@ -148,7 +148,7 @@ def render_single_champ(pdf, champ) add_libelle(pdf, champ) pdf.text champ.description pdf.text "\n" - when 'Champs::AddressChamp', 'Champs::CarteChamp', 'Champs::TextareaChamp' + when 'Champs::AddressChamp', 'Champs::CarteChamp', 'Champs::TextareaChamp' format_in_2_lines(pdf, champ, 5) when 'Champs::DropDownListChamp' add_libelle(pdf, champ) From f11256919201b30de18993e93dd4797d1cae68b7 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 5 Feb 2024 12:54:52 +0100 Subject: [PATCH 64/69] fix(haml-lint): TrailingEmptyLine --- .../attachment/edit_component/edit_component.html.haml | 1 - .../autosave_footer_component.html.haml | 1 - .../en_construction_not_submitted_component.html.haml | 1 - .../errors_full_messages_component.html.haml | 1 - .../export_link_component/export_link_component.html.haml | 1 - .../pending_correction_checkbox_component.html.haml | 1 - .../checkbox_component/checkbox_component.html.haml | 1 - .../editable_champ/cnaf_component/cnaf_component.html.haml | 1 - .../editable_champ/mesri_component/mesri_component.html.haml | 1 - .../instruction_menu_component.html.haml | 1 - .../estimated_delay_component.html.haml | 1 - .../instructeurs_menu_component.html.haml | 1 - .../profile/api_token_component/api_token_component.html.haml | 1 - .../tags_button_list_component.html.haml | 1 - .../administrateur_mailer/notify_service_without_siret.haml | 1 - .../attestation_templates/_informations.html.haml | 1 - app/views/administrateurs/procedures/zones.html.haml | 1 - .../types_de_champ/move_and_morph.turbo_stream.haml | 1 - app/views/gestionnaires/groupe_gestionnaires/show.html.haml | 1 - .../groupe_gestionnaires/tree_structure.html.haml | 1 - .../instructeurs/dossiers/_decisions_rendues_block.html.haml | 1 - app/views/layouts/_setup_theme.html.haml | 1 - app/views/shared/_mailer_round_button.html.haml | 1 - app/views/shared/archives/_notice.html.haml | 2 -- app/views/shared/champs/cnaf/_adresse.html.haml | 3 --- .../dossiers/_identite_entreprise_bilan_detail.html.haml | 1 - .../super_admins/release_notes/_main_navigation.html.haml | 1 - app/views/super_admins/release_notes/edit.html.haml | 1 - 28 files changed, 31 deletions(-) diff --git a/app/components/attachment/edit_component/edit_component.html.haml b/app/components/attachment/edit_component/edit_component.html.haml index 177902cfa7d..298972b2db7 100644 --- a/app/components/attachment/edit_component/edit_component.html.haml +++ b/app/components/attachment/edit_component/edit_component.html.haml @@ -39,4 +39,3 @@ %p.fr-error-text= t('.errors.uploading') = button_tag(**retry_button_options) do = t(".retry") - diff --git a/app/components/dossiers/autosave_footer_component/autosave_footer_component.html.haml b/app/components/dossiers/autosave_footer_component/autosave_footer_component.html.haml index 9370c64d445..28039d90c53 100644 --- a/app/components/dossiers/autosave_footer_component/autosave_footer_component.html.haml +++ b/app/components/dossiers/autosave_footer_component/autosave_footer_component.html.haml @@ -34,4 +34,3 @@ %button.fr-btn.fr-btn--tertiary.fr-btn--sm.autosave-retry{ type: :button, data: { action: 'autosave-status#onClickRetryButton', autosave_status_target: 'retryButton' } } %span.autosave-retry-label Réessayer %span.autosave-retrying-label Enregistrement en cours… - diff --git a/app/components/dossiers/en_construction_not_submitted_component/en_construction_not_submitted_component.html.haml b/app/components/dossiers/en_construction_not_submitted_component/en_construction_not_submitted_component.html.haml index 5fe2742814a..104ea0b1bb0 100644 --- a/app/components/dossiers/en_construction_not_submitted_component/en_construction_not_submitted_component.html.haml +++ b/app/components/dossiers/en_construction_not_submitted_component/en_construction_not_submitted_component.html.haml @@ -6,4 +6,3 @@ %ul.fr-mt-2w.fr-btns-group.fr-btns-group--inline %li= link_to t(".buttons.edit"), modifier_dossier_path(dossier), class: "fr-btn" %li= button_to t(".buttons.submit"), modifier_dossier_path(dossier), class: "fr-btn fr-btn--secondary", method: :post - diff --git a/app/components/dossiers/errors_full_messages_component/errors_full_messages_component.html.haml b/app/components/dossiers/errors_full_messages_component/errors_full_messages_component.html.haml index 26928640282..58d76cb56d7 100644 --- a/app/components/dossiers/errors_full_messages_component/errors_full_messages_component.html.haml +++ b/app/components/dossiers/errors_full_messages_component/errors_full_messages_component.html.haml @@ -13,4 +13,3 @@ %li = link_to error_descriptor.label, error_descriptor.anchor, class: 'error-anchor' = "(#{error_descriptor.error_message})" - diff --git a/app/components/dossiers/export_link_component/export_link_component.html.haml b/app/components/dossiers/export_link_component/export_link_component.html.haml index 941ca093562..0ed8d34a26b 100644 --- a/app/components/dossiers/export_link_component/export_link_component.html.haml +++ b/app/components/dossiers/export_link_component/export_link_component.html.haml @@ -15,4 +15,3 @@ - if export.failed? = button_to refresh_button_options(export)[:title], download_export_path(export_format: export.format, statut: export.statut), refresh_button_options(export) - diff --git a/app/components/dossiers/pending_correction_checkbox_component/pending_correction_checkbox_component.html.haml b/app/components/dossiers/pending_correction_checkbox_component/pending_correction_checkbox_component.html.haml index fc27bf9bd0a..b031a91014f 100644 --- a/app/components/dossiers/pending_correction_checkbox_component/pending_correction_checkbox_component.html.haml +++ b/app/components/dossiers/pending_correction_checkbox_component/pending_correction_checkbox_component.html.haml @@ -7,4 +7,3 @@ - if error? #dossier_pending_correction_error_messages.fr-messages-group{ aria: { live: "assertlive" } } %p.fr-message.fr-message--error= error_message - diff --git a/app/components/editable_champ/checkbox_component/checkbox_component.html.haml b/app/components/editable_champ/checkbox_component/checkbox_component.html.haml index 57368a9794e..ffead5a4311 100644 --- a/app/components/editable_champ/checkbox_component/checkbox_component.html.haml +++ b/app/components/editable_champ/checkbox_component/checkbox_component.html.haml @@ -6,4 +6,3 @@ 'false' %label.fr-label{ for: @champ.input_id, id: @champ.labelledby_id } = render EditableChamp::ChampLabelContentComponent.new form: @form, champ: @champ, seen_at: @seen_at - diff --git a/app/components/editable_champ/cnaf_component/cnaf_component.html.haml b/app/components/editable_champ/cnaf_component/cnaf_component.html.haml index 4eeb80fefb3..2f087629299 100644 --- a/app/components/editable_champ/cnaf_component/cnaf_component.html.haml +++ b/app/components/editable_champ/cnaf_component/cnaf_component.html.haml @@ -15,4 +15,3 @@ aria: { describedby: @champ.describedby_id }, class: "width-33-desktop", id: @champ.code_postal_input_id - diff --git a/app/components/editable_champ/mesri_component/mesri_component.html.haml b/app/components/editable_champ/mesri_component/mesri_component.html.haml index 173fe57f428..2b427a6c4c7 100644 --- a/app/components/editable_champ/mesri_component/mesri_component.html.haml +++ b/app/components/editable_champ/mesri_component/mesri_component.html.haml @@ -6,4 +6,3 @@ required: @champ.required?, aria: { describedby: @champ.describedby_id }, class: "width-33-desktop", id: @champ.input_id - diff --git a/app/components/instructeurs/instruction_menu_component/instruction_menu_component.html.haml b/app/components/instructeurs/instruction_menu_component/instruction_menu_component.html.haml index 319828d2201..84ad380a95f 100644 --- a/app/components/instructeurs/instruction_menu_component/instruction_menu_component.html.haml +++ b/app/components/instructeurs/instruction_menu_component/instruction_menu_component.html.haml @@ -31,4 +31,3 @@ - menu.with_item(class: "hidden inactive form-inside fr-pt-1v") do = render partial: 'instructeurs/dossiers/instruction_button_motivation', locals: { dossier: dossier, placeholder: 'Expliquez au demandeur pourquoi ce dossier est refusé (obligatoire)', popup_class: 'refuse', process_action: 'refuser', title: 'Refuser', confirm: 'Confirmez-vous le refus de ce dossier ?' } - diff --git a/app/components/procedure/estimated_delay_component/estimated_delay_component.html.haml b/app/components/procedure/estimated_delay_component/estimated_delay_component.html.haml index cb8aeecd808..ab908c0ae50 100644 --- a/app/components/procedure/estimated_delay_component/estimated_delay_component.html.haml +++ b/app/components/procedure/estimated_delay_component/estimated_delay_component.html.haml @@ -2,4 +2,3 @@ %ul - cleaned_nearby_estimation do |estimation, i18n_key| %li= t(".#{i18n_key}", estimation: estimation) - diff --git a/app/components/procedure/instructeurs_menu_component/instructeurs_menu_component.html.haml b/app/components/procedure/instructeurs_menu_component/instructeurs_menu_component.html.haml index f351776b1f0..df138518dfc 100644 --- a/app/components/procedure/instructeurs_menu_component/instructeurs_menu_component.html.haml +++ b/app/components/procedure/instructeurs_menu_component/instructeurs_menu_component.html.haml @@ -4,4 +4,3 @@ = render(Dsfr::SidemenuComponent.new) do |component| - component.with_links(links) .fr-col= content - diff --git a/app/components/profile/api_token_component/api_token_component.html.haml b/app/components/profile/api_token_component/api_token_component.html.haml index c2d28e4b3c6..ec9ccc8d942 100644 --- a/app/components/profile/api_token_component/api_token_component.html.haml +++ b/app/components/profile/api_token_component/api_token_component.html.haml @@ -19,4 +19,3 @@ admin_api_token_path(@api_token), class: 'fr-btn fr-btn--tertiary-no-outline fr-btn--sm fr-btn--icon-left fr-icon-delete-line', data: { turbo_method: :delete, confirm: "Confirmez-vous la suppression du jeton « #{@api_token.name} » ?" } - diff --git a/app/components/tags_button_list_component/tags_button_list_component.html.haml b/app/components/tags_button_list_component/tags_button_list_component.html.haml index 6a5cd2ecbb1..fa03ff4af7a 100644 --- a/app/components/tags_button_list_component/tags_button_list_component.html.haml +++ b/app/components/tags_button_list_component/tags_button_list_component.html.haml @@ -6,4 +6,3 @@ - label = button_label(tag) %button.fr-tag.fr-tag--sm{ type: "button", title: button_title(tag), data: { action: 'click->tiptap#insertTag', tiptap_target: 'tag', tag_id: tag[:id], tag_label: label } } = label - diff --git a/app/views/administrateur_mailer/notify_service_without_siret.haml b/app/views/administrateur_mailer/notify_service_without_siret.haml index 8f594dae985..9312f14d847 100644 --- a/app/views/administrateur_mailer/notify_service_without_siret.haml +++ b/app/views/administrateur_mailer/notify_service_without_siret.haml @@ -13,4 +13,3 @@ = link_to admin_procedures_url, admin_procedures_url = render partial: "layouts/mailers/signature" - diff --git a/app/views/administrateurs/attestation_templates/_informations.html.haml b/app/views/administrateurs/attestation_templates/_informations.html.haml index e8b7ae4e72d..35d20116da7 100644 --- a/app/views/administrateurs/attestation_templates/_informations.html.haml +++ b/app/views/administrateurs/attestation_templates/_informations.html.haml @@ -42,4 +42,3 @@ .fr-mt-4w = render Dsfr::InputComponent.new(form: f, attribute: :footer, input_type: :text_field, opts: { maxlength: 190, size: nil }, required: false) - diff --git a/app/views/administrateurs/procedures/zones.html.haml b/app/views/administrateurs/procedures/zones.html.haml index 5b560292a3d..e8b6e91ebea 100644 --- a/app/views/administrateurs/procedures/zones.html.haml +++ b/app/views/administrateurs/procedures/zones.html.haml @@ -29,4 +29,3 @@ .actions-right = link_to 'Annuler', admin_procedure_path(id: @procedure), class: 'fr-btn fr-btn--tertiary fr-mr-2w', data: { confirm: 'Êtes-vous sûr de vouloir annuler les modifications effectuées ?'} = f.button 'Enregistrer', class: 'fr-btn fr-btn--primary' - diff --git a/app/views/administrateurs/types_de_champ/move_and_morph.turbo_stream.haml b/app/views/administrateurs/types_de_champ/move_and_morph.turbo_stream.haml index 58b10b3c28a..500899d89bb 100644 --- a/app/views/administrateurs/types_de_champ/move_and_morph.turbo_stream.haml +++ b/app/views/administrateurs/types_de_champ/move_and_morph.turbo_stream.haml @@ -1,2 +1 @@ = render partial: 'insert' - diff --git a/app/views/gestionnaires/groupe_gestionnaires/show.html.haml b/app/views/gestionnaires/groupe_gestionnaires/show.html.haml index 5cd67d9212a..1fa8d87b91d 100644 --- a/app/views/gestionnaires/groupe_gestionnaires/show.html.haml +++ b/app/views/gestionnaires/groupe_gestionnaires/show.html.haml @@ -23,4 +23,3 @@ = render GroupeGestionnaire::Card::AdministrateursComponent.new(groupe_gestionnaire: @groupe_gestionnaire, path: gestionnaire_groupe_gestionnaire_administrateurs_path(@groupe_gestionnaire)) = render GroupeGestionnaire::Card::ChildrenComponent.new(groupe_gestionnaire: @groupe_gestionnaire, path: gestionnaire_groupe_gestionnaire_children_path(@groupe_gestionnaire)) = render GroupeGestionnaire::Card::CommentairesComponent.new(groupe_gestionnaire: @groupe_gestionnaire, administrateur: nil, path: gestionnaire_groupe_gestionnaire_commentaires_path(@groupe_gestionnaire), unread_commentaires: @unread_commentaires) - diff --git a/app/views/gestionnaires/groupe_gestionnaires/tree_structure.html.haml b/app/views/gestionnaires/groupe_gestionnaires/tree_structure.html.haml index f3757a96da9..3b10556576a 100644 --- a/app/views/gestionnaires/groupe_gestionnaires/tree_structure.html.haml +++ b/app/views/gestionnaires/groupe_gestionnaires/tree_structure.html.haml @@ -11,4 +11,3 @@ - @tree_structure.each do |parent, children| %li = render(GroupeGestionnaire::GroupeGestionnaireTreeStructures::TreeStructureComponent.new(parent: parent, children: children)) - diff --git a/app/views/instructeurs/dossiers/_decisions_rendues_block.html.haml b/app/views/instructeurs/dossiers/_decisions_rendues_block.html.haml index 80d2a648b34..2ffc8078836 100644 --- a/app/views/instructeurs/dossiers/_decisions_rendues_block.html.haml +++ b/app/views/instructeurs/dossiers/_decisions_rendues_block.html.haml @@ -10,4 +10,3 @@ = t(".without_email.#{traitement.state}", processed_at: processed_at) - else %p.tab-paragraph Aucune décision n’a été rendue - diff --git a/app/views/layouts/_setup_theme.html.haml b/app/views/layouts/_setup_theme.html.haml index 57c08dd772b..27fb2b79044 100644 --- a/app/views/layouts/_setup_theme.html.haml +++ b/app/views/layouts/_setup_theme.html.haml @@ -6,4 +6,3 @@ } } setDarkBeforeRender(); - diff --git a/app/views/shared/_mailer_round_button.html.haml b/app/views/shared/_mailer_round_button.html.haml index 012479f2fbd..77e0a452b98 100644 --- a/app/views/shared/_mailer_round_button.html.haml +++ b/app/views/shared/_mailer_round_button.html.haml @@ -7,4 +7,3 @@ %td{ align:"center", style:"border-radius: 5px;", color: theme[:color], bgcolor: theme[:bg_color] } %a{ href: url, target:"_blank", rel: "noopener", style:"font-size: 16px; font-family: Helvetica, Arial, sans-serif; color: #{theme[:color]}; text-decoration: none; text-decoration: none; border-radius: 5px; padding: 12px 25px; border: 1px solid #{theme[:border_color]}; display: inline-block; min-width: 250px" } = text - diff --git a/app/views/shared/archives/_notice.html.haml b/app/views/shared/archives/_notice.html.haml index 4c096ad548b..7b6002849a4 100644 --- a/app/views/shared/archives/_notice.html.haml +++ b/app/views/shared/archives/_notice.html.haml @@ -36,5 +36,3 @@ Nous vous invitons à regarder = link_to 'la documentation', ARCHIVAGE_DOC_URL afin de voir les options à votre disposition pour mettre en place un système d’archive. - - diff --git a/app/views/shared/champs/cnaf/_adresse.html.haml b/app/views/shared/champs/cnaf/_adresse.html.haml index 9c3cbdd1e53..7ffbe6b617d 100644 --- a/app/views/shared/champs/cnaf/_adresse.html.haml +++ b/app/views/shared/champs/cnaf/_adresse.html.haml @@ -5,6 +5,3 @@ %tr %th= t("api_particulier.providers.cnaf.scopes.adresse.#{key}") %td= adresse[key] - - - diff --git a/app/views/shared/dossiers/_identite_entreprise_bilan_detail.html.haml b/app/views/shared/dossiers/_identite_entreprise_bilan_detail.html.haml index 4611b8e801a..d102b632ff7 100644 --- a/app/views/shared/dossiers/_identite_entreprise_bilan_detail.html.haml +++ b/app/views/shared/dossiers/_identite_entreprise_bilan_detail.html.haml @@ -5,4 +5,3 @@ = "#{pretty_date_exercice(year_for_bilan(bilan))} :" = pretty_currency(value_for_bilan_key(bilan, key), unit: pretty_currency_unit(etablissement.entreprise_bilans_bdf_monnaie)) %br - diff --git a/app/views/super_admins/release_notes/_main_navigation.html.haml b/app/views/super_admins/release_notes/_main_navigation.html.haml index 8207cee4862..1485a91fa66 100644 --- a/app/views/super_admins/release_notes/_main_navigation.html.haml +++ b/app/views/super_admins/release_notes/_main_navigation.html.haml @@ -13,4 +13,3 @@ %li.fr-nav__item = link_to "Annonces publiées", release_notes_path, class: "fr-nav__link", target: "_self" - diff --git a/app/views/super_admins/release_notes/edit.html.haml b/app/views/super_admins/release_notes/edit.html.haml index df87cc38679..d67c2e516de 100644 --- a/app/views/super_admins/release_notes/edit.html.haml +++ b/app/views/super_admins/release_notes/edit.html.haml @@ -5,4 +5,3 @@ .fr-col-lg-10 %h1.fr-h2 Annonce = render ReleaseNote::FormComponent.new(release_note: @release_note) - From 1f6bdc8286e98ad5dac89358f1d21a41376304b0 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 5 Feb 2024 13:01:14 +0100 Subject: [PATCH 65/69] fix(haml-lint): syntax error with ERB in haml scaffold file --- lib/templates/haml/scaffold/_form.html.haml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/templates/haml/scaffold/_form.html.haml b/lib/templates/haml/scaffold/_form.html.haml index ac3aa7bc114..4cf0ab2d6e7 100644 --- a/lib/templates/haml/scaffold/_form.html.haml +++ b/lib/templates/haml/scaffold/_form.html.haml @@ -1,10 +1,9 @@ -= simple_form_for(@<%= singular_table_name %>) do |f| += simple_form_for(@#{singular_table_name}) do |f| = f.error_notification .form-inputs - <%- attributes.each do |attribute| -%> - = f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> - <%- end -%> + - attributes.each do |attribute| + = f.send(attribute.reference? ? :association : :input, attribute.name) .form-actions = f.button :submit From d520e035d52bfe6f987c0aaa561398efb73d3c69 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 5 Feb 2024 13:39:44 +0100 Subject: [PATCH 66/69] fix(rubocop): Style/SymbolProc config --- .rubocop.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index 40984b5dc4c..e4f06ef32e4 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1438,7 +1438,6 @@ Style/SymbolLiteral: Style/SymbolProc: Enabled: true - IgnoredMethods: [after] Style/TernaryParentheses: Enabled: false From cd21eac33040286aaff47c34241831a3d1eb8437 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 5 Feb 2024 15:53:55 +0100 Subject: [PATCH 67/69] fix(i18n): missing one value in pluralization --- config/i18n-tasks.yml | 4 ++-- config/locales/models/dubious_procedure/fr.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index 5e2a106b564..82d29a1c910 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -132,8 +132,8 @@ ignore_unused: # - 'activerecord.attributes.*' ## Ignore these keys completely: -# ignore: -# - kaminari.* +ignore: +- 'shared.champs.drop_down_list{,.other}' # pluralization "other" false positive ## Sometimes, it isn't possible for i18n-tasks to match the key correctly, ## e.g. in case of a relative key defined in a helper method. diff --git a/config/locales/models/dubious_procedure/fr.yml b/config/locales/models/dubious_procedure/fr.yml index c50bd2b75dd..ce085e979b3 100644 --- a/config/locales/models/dubious_procedure/fr.yml +++ b/config/locales/models/dubious_procedure/fr.yml @@ -2,6 +2,7 @@ fr: activemodel: models: outdated_procedure: + one: Démarche sans expiration other: Démarches sans expiration attributes: outdated_procedure: From 18e5e13ebac1d3b71df94116a5f06d6295115d80 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Mon, 5 Feb 2024 16:04:36 +0100 Subject: [PATCH 68/69] test: fix devise-i18n change courriel => email --- spec/system/sessions/sign_in_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/system/sessions/sign_in_spec.rb b/spec/system/sessions/sign_in_spec.rb index 7e85210b582..c93896dc96f 100644 --- a/spec/system/sessions/sign_in_spec.rb +++ b/spec/system/sessions/sign_in_spec.rb @@ -78,7 +78,7 @@ click_on 'Se connecter', match: :first sign_in_with user.email, password - expect(page).to have_content('Vous devez confirmer votre compte par courriel.') + expect(page).to have_content('Vous devez confirmer votre compte par email.') end end end From c4110c35bf261c7e67a6dfc7e14079885c38e7a9 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Wed, 7 Feb 2024 12:10:40 +0100 Subject: [PATCH 69/69] fix(graphql): json error is not anymore prefixed by unknown line number --- spec/controllers/api/v2/graphql_controller_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/controllers/api/v2/graphql_controller_spec.rb b/spec/controllers/api/v2/graphql_controller_spec.rb index 3447beaecc5..2a086ddb181 100644 --- a/spec/controllers/api/v2/graphql_controller_spec.rb +++ b/spec/controllers/api/v2/graphql_controller_spec.rb @@ -984,7 +984,7 @@ def format_type_champ(type_champ) it "should fail" do expect(gql_data).to eq(nil) expect(gql_errors).not_to eq(nil) - expect(body[:errors].first[:message]).to eq("809: unexpected token at '{'") + expect(body[:errors].first[:message]).to eq("unexpected token at '{'") expect(body[:errors].first.key?(:backtrace)).to be_falsey end end