Upgrade Herb and deps

Author: thibaudgg

.herb.yml

@@ -11,7 +11,7 @@
 # GitHub Repo: https://github.com/marcoroth/herb
 #
 
-version: 0.9.5
+version: 0.9.7
 
 files:
   # Patterns to exclude (can exclude defaults too)

Gemfile

@@ -109,7 +109,7 @@ group :development do
   gem "rubocop-rails-omakase", require: false
   gem "rubocop-erb", require: false
   gem "rubocop-minitest", require: false
-  gem "herb", "0.9.5", require: false
+  gem "herb", require: false
 
   # Security
   gem "brakeman", require: false

Gemfile.lock

@@ -128,8 +128,8 @@ GEM
       async-http (~> 0.42)
       protocol-url (~> 0.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1239.0)
-    aws-sdk-core (3.244.0)
+    aws-partitions (1.1240.0)
+    aws-sdk-core (3.245.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -149,7 +149,7 @@ GEM
     base64 (0.3.0)
     bcrypt (3.1.22)
     bcrypt_pbkdf (1.1.2)
-    bigdecimal (4.1.1)
+    bigdecimal (4.1.2)
     bindex (0.8.1)
     bootsnap (1.23.0)
       msgpack (~> 1.2)
@@ -269,10 +269,10 @@ GEM
       activesupport (>= 7.0)
     hashdiff (1.2.1)
     hashery (2.1.2)
-    herb (0.9.5-aarch64-linux-gnu)
-    herb (0.9.5-arm64-darwin)
-    herb (0.9.5-x86_64-linux-gnu)
-    herb (0.9.5-x86_64-linux-musl)
+    herb (0.9.7-aarch64-linux-gnu)
+    herb (0.9.7-arm64-darwin)
+    herb (0.9.7-x86_64-linux-gnu)
+    herb (0.9.7-x86_64-linux-musl)
     hexapdf (1.7.0)
       cmdparse (~> 3.0, >= 3.0.3)
       geom2d (~> 0.4, >= 0.4.1)
@@ -316,7 +316,7 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)
-    json (2.19.3)
+    json (2.19.4)
     kamal (2.11.0)
       activesupport (>= 7.0)
       base64 (~> 0.2)
@@ -461,7 +461,7 @@ GEM
       dispersion (~> 0.2)
     prettyprint (0.2.0)
     prism (1.9.0)
-    propshaft (1.3.1)
+    propshaft (1.3.2)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
       rack
@@ -725,7 +725,7 @@ DEPENDENCIES
   epics
   faker
   girocode
-  herb (= 0.9.5)
+  herb
   hexapdf
   i18n-backend-side_by_side
   icalendar
@@ -809,15 +809,15 @@ CHECKSUMS
   async-pool (0.11.2) sha256=0a43a17b02b04d9c451b7d12fafa9a50e55dc6dd00d4369aca00433f16a7e3ed
   async-rest (0.20.0) sha256=72b0d467f65269a53a64fc12b828f3d81b4afa201b4eea0b98cddb990e7e95eb
   aws-eventstream (1.4.0) sha256=116bf85c436200d1060811e6f5d2d40c88f65448f2125bc77ffce5121e6e183b
-  aws-partitions (1.1239.0) sha256=177ac594c71d7c720888e3fc063bbb919bc8ae1f29192c6d42d304cd0a3c6e0c
-  aws-sdk-core (3.244.0) sha256=3e458c078b0c5bdee95bc370c3a483374b3224cf730c1f9f0faf849a5d9a18ea
+  aws-partitions (1.1240.0) sha256=b885b21712fdad699c56a28434756ed27f1389b07231320796dda9e7551de4a7
+  aws-sdk-core (3.245.0) sha256=94f43b40508c346f1625b3d31f811c5841b667c92de14d5fb3c473b1284cb4ad
   aws-sdk-kms (1.123.0) sha256=d405f37e82f8fa32045ca8980be266c0b45b37aaf2012afe0254321a1e811f20
   aws-sdk-s3 (1.219.0) sha256=6a755d7377978525758b3c29185ca6a10128ce2b07555ca37c4549de10c2f1c7
   aws-sigv4 (1.12.1) sha256=6973ff95cb0fd0dc58ba26e90e9510a2219525d07620c8babeb70ef831826c00
   base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
   bcrypt (3.1.22) sha256=1f0072e88c2d705d94aff7f2c5cb02eb3f1ec4b8368671e19112527489f29032
   bcrypt_pbkdf (1.1.2) sha256=c2414c23ce66869b3eb9f643d6a3374d8322dfb5078125c82792304c10b94cf6
-  bigdecimal (4.1.1) sha256=1c09efab961da45203c8316b0cdaec0ff391dfadb952dd459584b63ebf8054ca
+  bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
   bindex (0.8.1) sha256=7b1ecc9dc539ed8bccfc8cb4d2732046227b09d6f37582ff12e50a5047ceb17e
   bootsnap (1.23.0) sha256=c1254f458d58558b58be0f8eb8f6eec2821456785b7cdd1e16248e2020d3f214
   brakeman (8.0.4) sha256=7bf921fa9638544835df9aa7b3e720a9a72c0267f34f92135955edd80d4dcf6f
@@ -875,10 +875,10 @@ CHECKSUMS
   has_scope (0.9.0) sha256=783a93006cf898525bb4899696f1d088c0f6ff897d6df2bf03fdbbe0d0b5124c
   hashdiff (1.2.1) sha256=9c079dbc513dfc8833ab59c0c2d8f230fa28499cc5efb4b8dd276cf931457cd1
   hashery (2.1.2) sha256=d239cc2310401903f6b79d458c2bbef5bf74c46f3f974ae9c1061fb74a404862
-  herb (0.9.5-aarch64-linux-gnu) sha256=3338dcec96e0fae1a384d4e01a64d8c1dddb91ca27b9e61b399d1fe77f654477
-  herb (0.9.5-arm64-darwin) sha256=342c2065e6bf27b0fc3cd9d52906cf773caa9962642f57dbd2146abf43ce0295
-  herb (0.9.5-x86_64-linux-gnu) sha256=5acd1a63bf456f27d66b5833649e493ab0f1527fb8ae44325cf76639d7b592db
-  herb (0.9.5-x86_64-linux-musl) sha256=799e53792abfd89cdcdd018d661066a28506de25d0de9f05353a65a77af9dc2a
+  herb (0.9.7-aarch64-linux-gnu) sha256=4fb48eefdd3217e9824b2947c1fb6464b9e65159c683c6e408a25bb5fd05bea8
+  herb (0.9.7-arm64-darwin) sha256=e3cb927fb1f43b6dd16b984e7c35508ba1b65b0559771ef297d89adae9853fc9
+  herb (0.9.7-x86_64-linux-gnu) sha256=176f9c4c58f59e7f8534368824202a601dd787d89df82be47b8f0ef39801a886
+  herb (0.9.7-x86_64-linux-musl) sha256=a2eb06a36ea90c225019c1bd2e3487de66060730b67973824893288279f05038
   hexapdf (1.7.0) sha256=df9502a157ee2c3248573a14be8410045f104ca7ae8f46a2a4301406c5ce4155
   htmlentities (4.4.2) sha256=bbafbdf69f2eca9262be4efef7e43e6a1de54c95eb600f26984f71d2fe96c5c3
   i18n (1.14.8) sha256=285778639134865c5e0f6269e0b818256017e8cde89993fdfcbfb64d088824a5
@@ -896,7 +896,7 @@ CHECKSUMS
   io-stream (0.11.1) sha256=fa5f551fcff99581c1757b9d1cee2c37b124f07d2ca4f40b756a05ab9bd21b87
   irb (1.17.0) sha256=168c4ddb93d8a361a045c41d92b2952c7a118fa73f23fe14e55609eb7a863aae
   jmespath (1.6.2) sha256=238d774a58723d6c090494c8879b5e9918c19485f7e840f2c1c7532cf84ebcb1
-  json (2.19.3) sha256=289b0bb53052a1fa8c34ab33cc750b659ba14a5c45f3fcf4b18762dc67c78646
+  json (2.19.4) sha256=670a7d333fb3b18ca5b29cb255eb7bef099e40d88c02c80bd42a3f30fe5239ac
   kamal (2.11.0) sha256=1408864425e0dec7e0a14d712a3b13f614e9f3a425b7661d3f9d287a51d7dd75
   kaminari (1.2.2) sha256=c4076ff9adccc6109408333f87b5c4abbda5e39dc464bd4c66d06d9f73442a3e
   kaminari-actionview (1.2.2) sha256=1330f6fc8b59a4a4ef6a549ff8a224797289ebf7a3a503e8c1652535287cc909
@@ -954,7 +954,7 @@ CHECKSUMS
   pretty_please (0.2.0) sha256=1f00296f946ae8ffd53db25803ed3998d615b9cc07526517dc75fcca6af3a0d3
   prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193
   prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85
-  propshaft (1.3.1) sha256=9acc664ef67e819ffa3d95bd7ad4c3623ea799110c5f4dee67fa7e583e74c392
+  propshaft (1.3.2) sha256=1d56a3e56a92c21bfc29caf07406b5386b00d4c47ddf357cf989a5a234b1389e
   protocol-hpack (1.5.1) sha256=6feca238b8078da1cd295677d6f306c6001af92d75fe0643d33e6956cbc3ad91
   protocol-http (0.62.2) sha256=e1c1f2f56029c1af8c4e2b8a67d0d096c76620f3afd8d99d1dcd2f6b8ffa773b
   protocol-http1 (0.39.0) sha256=e49b3f4cda6f5d94c76a323d2b7f6977cba3ebd082d2da437039594da77ad8eb

app/views/members/activity_participations/index.html.erb

@@ -61,12 +61,6 @@
 
 <% @coming_participations = current_member.activity_participations.coming.includes(:activity).merge(Activity.ordered(:asc)) %>
 
-<% condition = @coming_participations.any? { |p| !p.destroyable? } %>
-
-<% message_class = condition ? "mt-4 pb-4 text-center text-sm italic text-gray-400 dark:text-gray-500" : "nocontent" %>
-
-<% message_text = condition ? t(".coming_activity_participation_cannot_be_cancel_explanation_html", days_count: Current.org.activity_participation_deletion_deadline_in_days, contact_link: mail_to(Current.org.email, t(".contact_link"))) : t(".edit_activity_participation_explanation") %>
-
 <% if @coming_participations.any? %>
   <section>
     <h2><%= t(".coming_activity_participations") %></h2>
@@ -75,7 +69,22 @@
       <%= render @coming_participations %>
     </ul>
 
-    <p class="<%= message_class %>"><%= message_text %></p>
+    <% if @coming_participations.any? { |p| !p.destroyable? } %>
+      <p
+        class="
+          mt-4 pb-4 text-center text-sm text-gray-400 italic
+          dark:text-gray-500
+        "
+      >
+        <%= t(".coming_activity_participation_cannot_be_cancel_explanation_html",
+          days_count: Current.org.activity_participation_deletion_deadline_in_days,
+          contact_link: mail_to(Current.org.email, t(".contact_link"))) %>
+      </p>
+    <% else %>
+      <p class="nocontent">
+        <%= t(".edit_activity_participation_explanation") %>
+      </p>
+    <% end %>
   </section>
 <% end %>
 

package-lock.json

@@ -1,7 +1,7 @@
 {
   "devDependencies": {
-    "@herb-tools/linter": "0.9.5",
-    "@herb-tools/formatter": "0.9.5",
+    "@herb-tools/linter": "^0.9",
+    "@herb-tools/formatter": "^0.9",
     "prettier": "^3.6",
     "prettier-plugin-tailwindcss": "^0.6"
   }