From 6ac825ed5f670e473ee418879287e285007bc9ad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Feb 2024 00:53:13 +0000
Subject: [PATCH 01/53] Bump standard from 1.33.0 to 1.34.0 (#2203)
---
Gemfile | 2 +-
Gemfile.lock | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Gemfile b/Gemfile
index 9d12c0685..7e614a583 100644
--- a/Gemfile
+++ b/Gemfile
@@ -129,7 +129,7 @@ group :development, :test do
gem "rubocop-rails"
gem "rubocop-rspec"
- gem "standard", "~> 1.33"
+ gem "standard", "~> 1.34"
end
group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index 349f4dc4d..e40317048 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -297,7 +297,7 @@ GEM
racc (~> 1.4)
pagy (6.4.3)
parallel (1.24.0)
- parser (3.3.0.0)
+ parser (3.3.0.5)
ast (~> 2.4.1)
racc
pg (1.5.4)
@@ -411,11 +411,11 @@ GEM
rswag-ui (2.13.0)
actionpack (>= 3.1, < 7.2)
railties (>= 3.1, < 7.2)
- rubocop (1.59.0)
+ rubocop (1.60.2)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
- parser (>= 3.2.2.4)
+ parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
@@ -428,7 +428,7 @@ GEM
rubocop (~> 1.41)
rubocop-factory_bot (2.25.0)
rubocop (~> 1.33)
- rubocop-performance (1.20.1)
+ rubocop-performance (1.20.2)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.30.0, < 2.0)
rubocop-rails (2.23.1)
@@ -482,18 +482,18 @@ GEM
apimatic_core (~> 0.3.0)
apimatic_core_interfaces (~> 0.2.0)
apimatic_faraday_client_adapter (~> 0.1.0)
- standard (1.33.0)
+ standard (1.34.0)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
- rubocop (~> 1.59.0)
+ rubocop (~> 1.60)
standard-custom (~> 1.0.0)
standard-performance (~> 1.3)
standard-custom (1.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.50)
- standard-performance (1.3.0)
+ standard-performance (1.3.1)
lint_roller (~> 1.1)
- rubocop-performance (~> 1.20.1)
+ rubocop-performance (~> 1.20.2)
stimulus-rails (1.3.3)
railties (>= 6.0.0)
stringio (3.1.0)
@@ -592,7 +592,7 @@ DEPENDENCIES
spring-watcher-listen!
sprockets-rails
square.rb
- standard (~> 1.33)
+ standard (~> 1.34)
stimulus-rails
strip_attributes (~> 1.13)
stripe
From 6d3de2a2c910b812cca4493422668442e82d53f5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Feb 2024 00:53:45 +0000
Subject: [PATCH 02/53] Bump @sentry/browser from 7.100.1 to 7.101.0 (#2202)
---
package.json | 2 +-
yarn.lock | 140 +++++++++++++++++++++++++--------------------------
2 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/package.json b/package.json
index 03ebbb59d..95885ab2a 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
"@hotwired/turbo-rails": "^8.0.2",
"@rails/actioncable": "^7.1.3",
"@rails/activestorage": "^7.1.3",
- "@sentry/browser": "^7.100.1",
+ "@sentry/browser": "^7.101.0",
"@tailwindcss/forms": "^0.5.7",
"@tailwindcss/typography": "^0.5.10",
"@webpack-cli/serve": "^2.0.5",
diff --git a/yarn.lock b/yarn.lock
index 2232f4036..c49581a9e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -380,76 +380,76 @@
dependencies:
spark-md5 "^3.0.1"
-"@sentry-internal/feedback@7.100.1":
- version "7.100.1"
- resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-7.100.1.tgz#99585ba6f71eca3e7afe918273dd55b12f3aac8a"
- integrity sha512-yqcRVnjf+qS+tC4NxOKLJOaSJ+csHmh/dHUzvCTkf5rLsplwXYRnny2r0tqGTQ4tuXMxwgSMKPYwicg81P+xuw==
- dependencies:
- "@sentry/core" "7.100.1"
- "@sentry/types" "7.100.1"
- "@sentry/utils" "7.100.1"
-
-"@sentry-internal/replay-canvas@7.100.1":
- version "7.100.1"
- resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-7.100.1.tgz#d37228575931b869d2ad415af46b342d83dd0fd7"
- integrity sha512-TnqxqJGhbFhhYRhTG2WLFer+lVieV7mNGeIxFBiw1L4kuj8KGl+C0sknssKyZSRVJFSahhHIosHJGRMkkD//7g==
- dependencies:
- "@sentry/core" "7.100.1"
- "@sentry/replay" "7.100.1"
- "@sentry/types" "7.100.1"
- "@sentry/utils" "7.100.1"
-
-"@sentry-internal/tracing@7.100.1":
- version "7.100.1"
- resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.100.1.tgz#4329492e50c390567197a4acbf7e3672b1db7820"
- integrity sha512-+u9RRf5eL3StiyiRyAHZmdkAR7GTSGx4Mt4Lmi5NEtCcWlTGZ1QgW2r8ZbhouVmTiJkjhQgYCyej3cojtazeJg==
- dependencies:
- "@sentry/core" "7.100.1"
- "@sentry/types" "7.100.1"
- "@sentry/utils" "7.100.1"
-
-"@sentry/browser@^7.100.1":
- version "7.100.1"
- resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.100.1.tgz#146ffca94cc187ecbf49915ef3100f6037316110"
- integrity sha512-IxHQ08ixf0bmaWpe4yt1J4UUsOpg02fxax9z3tOQYXw5MSzz5pDXn8M8DFUVJB3wWuyXhHXTub9yD3VIP9fnoA==
- dependencies:
- "@sentry-internal/feedback" "7.100.1"
- "@sentry-internal/replay-canvas" "7.100.1"
- "@sentry-internal/tracing" "7.100.1"
- "@sentry/core" "7.100.1"
- "@sentry/replay" "7.100.1"
- "@sentry/types" "7.100.1"
- "@sentry/utils" "7.100.1"
-
-"@sentry/core@7.100.1":
- version "7.100.1"
- resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.100.1.tgz#7b8e101a931af8e8b3b2449534749f882772df4f"
- integrity sha512-f+ItUge/o9AjlveQq0ZUbQauKlPH1FIJbC1TRaYLJ4KNfOdrsh8yZ29RmWv0cFJ/e+FGTr603gWpRPObF5rM8Q==
- dependencies:
- "@sentry/types" "7.100.1"
- "@sentry/utils" "7.100.1"
-
-"@sentry/replay@7.100.1":
- version "7.100.1"
- resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.100.1.tgz#d9af5f8e92ce0f93cef89f5aef74d91a8d12c3eb"
- integrity sha512-B1NFjzGEFaqejxBRdUyEzH8ChXc2kfiqlA/W/Lg0aoWIl2/7nuMk+l4ld9gW5F5bIAXDTVd5vYltb1lWEbpr7w==
- dependencies:
- "@sentry-internal/tracing" "7.100.1"
- "@sentry/core" "7.100.1"
- "@sentry/types" "7.100.1"
- "@sentry/utils" "7.100.1"
-
-"@sentry/types@7.100.1":
- version "7.100.1"
- resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.100.1.tgz#1349b77269cecf4e80c087842575bd1a001e9995"
- integrity sha512-fLM+LedHuKzOd8IhXBqaQuym+AA519MGjeczBa5kGakes/BbAsUMwsNfjsKQedp7Kh44RgYF99jwoRPK2oDrXw==
-
-"@sentry/utils@7.100.1":
- version "7.100.1"
- resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.100.1.tgz#6e26f3b06b1e485a2180f464ab3374ecb8d5e407"
- integrity sha512-Ve6dXr1o6xiBe3VCoJgiutmBKrugryI65EZAbYto5XI+t+PjiLLf9wXtEMF24ZrwImo4Lv3E9Uqza+fWkEbw6A==
- dependencies:
- "@sentry/types" "7.100.1"
+"@sentry-internal/feedback@7.101.0":
+ version "7.101.0"
+ resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-7.101.0.tgz#cce033c80c498212a5b9a9540ff3ab8297eefbe2"
+ integrity sha512-uQBMYhZp/qkBEA/GXRMm1OfSkRkZojxBrCrFmzkWhJzXT+YbL57/M1uCcwkKmorKlg393Soh7MLULInwmcwWkA==
+ dependencies:
+ "@sentry/core" "7.101.0"
+ "@sentry/types" "7.101.0"
+ "@sentry/utils" "7.101.0"
+
+"@sentry-internal/replay-canvas@7.101.0":
+ version "7.101.0"
+ resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-7.101.0.tgz#0e32e1bebd4d125126e481c0df5f7186edeadbf4"
+ integrity sha512-fiz4kPpz/j6ZaD+vOcUXuO1HqD49djs4QwyTsRwCCi77EKZOGAaijpqWckDWyZs0dOOnbGGGC5x3o+CfTJcjKA==
+ dependencies:
+ "@sentry/core" "7.101.0"
+ "@sentry/replay" "7.101.0"
+ "@sentry/types" "7.101.0"
+ "@sentry/utils" "7.101.0"
+
+"@sentry-internal/tracing@7.101.0":
+ version "7.101.0"
+ resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.101.0.tgz#9a92ee722d071449a61c061867aa43a5beefcfb6"
+ integrity sha512-rp9oOLQs6vMuzvAnAHRRCNu5Z0o/ZVRI3WPYedxpdMWKD1Z3G9o+0joP+ZIUqHsamWWYiIgPqXgL9AK6AWjFRg==
+ dependencies:
+ "@sentry/core" "7.101.0"
+ "@sentry/types" "7.101.0"
+ "@sentry/utils" "7.101.0"
+
+"@sentry/browser@^7.101.0":
+ version "7.101.0"
+ resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.101.0.tgz#53ecfa8a9b0076b95930dff5bbb616e827608606"
+ integrity sha512-wj9YLfS/caR20Yq0hdEjsZHuhnYLU7Ht0SlcJx5MNMnArtmW1k2CWZz3PCqcW/rTZe53npVTe6eMqMccB4aPrQ==
+ dependencies:
+ "@sentry-internal/feedback" "7.101.0"
+ "@sentry-internal/replay-canvas" "7.101.0"
+ "@sentry-internal/tracing" "7.101.0"
+ "@sentry/core" "7.101.0"
+ "@sentry/replay" "7.101.0"
+ "@sentry/types" "7.101.0"
+ "@sentry/utils" "7.101.0"
+
+"@sentry/core@7.101.0":
+ version "7.101.0"
+ resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.101.0.tgz#7ddae48771bad6d3170df0d9807f86c39824dd0a"
+ integrity sha512-dRNrNV5OLGARkOGgxJsVDhA98Pev5G1LVJcud5E83cRg49BCUx2riqEtDP6iIS1nvem6cApkSnLC1kvl/T5/Cw==
+ dependencies:
+ "@sentry/types" "7.101.0"
+ "@sentry/utils" "7.101.0"
+
+"@sentry/replay@7.101.0":
+ version "7.101.0"
+ resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.101.0.tgz#66d199316be3f0fc2ed82a5294f519d58a2c2260"
+ integrity sha512-DSWkGKI/QhCAY+qm4mBnPob3/YsewisskVTak7KMDotJ75H85WFJhVwOMtvaEWIzVezCOItPv7ql51jTwhR3wA==
+ dependencies:
+ "@sentry-internal/tracing" "7.101.0"
+ "@sentry/core" "7.101.0"
+ "@sentry/types" "7.101.0"
+ "@sentry/utils" "7.101.0"
+
+"@sentry/types@7.101.0":
+ version "7.101.0"
+ resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.101.0.tgz#0174a32d6c12def73f438dc2a10bd52cc0ba0c81"
+ integrity sha512-YC+ltO/AlbEyJHjCUYQ4is1HcDT2zSMuLkIAcyQmK7fUdlGT4iR5sfENriY9ZopYHgjPdJKfhI8ohScam7zp/A==
+
+"@sentry/utils@7.101.0":
+ version "7.101.0"
+ resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.101.0.tgz#0eadb9709c9b6fbc03d509acf7fe6a00ab4e6220"
+ integrity sha512-px1NUkCLsD9UKLE4W4DghpyzmAVHgYhskrjRt30ubyUKqlggtHkOXRvS8MjuWowR/i0wF0GuTCbU9StBd7JMrw==
+ dependencies:
+ "@sentry/types" "7.101.0"
"@sindresorhus/merge-streams@^1.0.0":
version "1.0.0"
From b85f1dcdf894fa30375c37c0c771f5251e14a0e2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Feb 2024 23:31:25 +0000
Subject: [PATCH 03/53] Bump pagy from 6.4.3 to 6.4.4 (#2205)
---
Gemfile.lock | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index e40317048..7f71b43e2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -295,7 +295,7 @@ GEM
nokogiri (1.16.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
- pagy (6.4.3)
+ pagy (6.4.4)
parallel (1.24.0)
parser (3.3.0.5)
ast (~> 2.4.1)
From 4bcfd99a4ee6a2e51e4a2d797eda56e1f7478d65 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Feb 2024 00:54:43 +0000
Subject: [PATCH 04/53] Bump pg from 1.5.4 to 1.5.5 (#2209)
---
Gemfile.lock | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index 7f71b43e2..a954306f4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -300,7 +300,7 @@ GEM
parser (3.3.0.5)
ast (~> 2.4.1)
racc
- pg (1.5.4)
+ pg (1.5.5)
pry (0.14.1)
coderay (~> 1.1)
method_source (~> 1.0)
From 558d2ca4508821697d535f48db0378266aca279b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Feb 2024 00:54:58 +0000
Subject: [PATCH 05/53] Bump @sentry/browser from 7.101.0 to 7.101.1 (#2207)
---
package.json | 2 +-
yarn.lock | 140 +++++++++++++++++++++++++--------------------------
2 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/package.json b/package.json
index 95885ab2a..064d6a4f2 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
"@hotwired/turbo-rails": "^8.0.2",
"@rails/actioncable": "^7.1.3",
"@rails/activestorage": "^7.1.3",
- "@sentry/browser": "^7.101.0",
+ "@sentry/browser": "^7.101.1",
"@tailwindcss/forms": "^0.5.7",
"@tailwindcss/typography": "^0.5.10",
"@webpack-cli/serve": "^2.0.5",
diff --git a/yarn.lock b/yarn.lock
index c49581a9e..f63afcfbc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -380,76 +380,76 @@
dependencies:
spark-md5 "^3.0.1"
-"@sentry-internal/feedback@7.101.0":
- version "7.101.0"
- resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-7.101.0.tgz#cce033c80c498212a5b9a9540ff3ab8297eefbe2"
- integrity sha512-uQBMYhZp/qkBEA/GXRMm1OfSkRkZojxBrCrFmzkWhJzXT+YbL57/M1uCcwkKmorKlg393Soh7MLULInwmcwWkA==
- dependencies:
- "@sentry/core" "7.101.0"
- "@sentry/types" "7.101.0"
- "@sentry/utils" "7.101.0"
-
-"@sentry-internal/replay-canvas@7.101.0":
- version "7.101.0"
- resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-7.101.0.tgz#0e32e1bebd4d125126e481c0df5f7186edeadbf4"
- integrity sha512-fiz4kPpz/j6ZaD+vOcUXuO1HqD49djs4QwyTsRwCCi77EKZOGAaijpqWckDWyZs0dOOnbGGGC5x3o+CfTJcjKA==
- dependencies:
- "@sentry/core" "7.101.0"
- "@sentry/replay" "7.101.0"
- "@sentry/types" "7.101.0"
- "@sentry/utils" "7.101.0"
-
-"@sentry-internal/tracing@7.101.0":
- version "7.101.0"
- resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.101.0.tgz#9a92ee722d071449a61c061867aa43a5beefcfb6"
- integrity sha512-rp9oOLQs6vMuzvAnAHRRCNu5Z0o/ZVRI3WPYedxpdMWKD1Z3G9o+0joP+ZIUqHsamWWYiIgPqXgL9AK6AWjFRg==
- dependencies:
- "@sentry/core" "7.101.0"
- "@sentry/types" "7.101.0"
- "@sentry/utils" "7.101.0"
-
-"@sentry/browser@^7.101.0":
- version "7.101.0"
- resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.101.0.tgz#53ecfa8a9b0076b95930dff5bbb616e827608606"
- integrity sha512-wj9YLfS/caR20Yq0hdEjsZHuhnYLU7Ht0SlcJx5MNMnArtmW1k2CWZz3PCqcW/rTZe53npVTe6eMqMccB4aPrQ==
- dependencies:
- "@sentry-internal/feedback" "7.101.0"
- "@sentry-internal/replay-canvas" "7.101.0"
- "@sentry-internal/tracing" "7.101.0"
- "@sentry/core" "7.101.0"
- "@sentry/replay" "7.101.0"
- "@sentry/types" "7.101.0"
- "@sentry/utils" "7.101.0"
-
-"@sentry/core@7.101.0":
- version "7.101.0"
- resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.101.0.tgz#7ddae48771bad6d3170df0d9807f86c39824dd0a"
- integrity sha512-dRNrNV5OLGARkOGgxJsVDhA98Pev5G1LVJcud5E83cRg49BCUx2riqEtDP6iIS1nvem6cApkSnLC1kvl/T5/Cw==
- dependencies:
- "@sentry/types" "7.101.0"
- "@sentry/utils" "7.101.0"
-
-"@sentry/replay@7.101.0":
- version "7.101.0"
- resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.101.0.tgz#66d199316be3f0fc2ed82a5294f519d58a2c2260"
- integrity sha512-DSWkGKI/QhCAY+qm4mBnPob3/YsewisskVTak7KMDotJ75H85WFJhVwOMtvaEWIzVezCOItPv7ql51jTwhR3wA==
- dependencies:
- "@sentry-internal/tracing" "7.101.0"
- "@sentry/core" "7.101.0"
- "@sentry/types" "7.101.0"
- "@sentry/utils" "7.101.0"
-
-"@sentry/types@7.101.0":
- version "7.101.0"
- resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.101.0.tgz#0174a32d6c12def73f438dc2a10bd52cc0ba0c81"
- integrity sha512-YC+ltO/AlbEyJHjCUYQ4is1HcDT2zSMuLkIAcyQmK7fUdlGT4iR5sfENriY9ZopYHgjPdJKfhI8ohScam7zp/A==
-
-"@sentry/utils@7.101.0":
- version "7.101.0"
- resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.101.0.tgz#0eadb9709c9b6fbc03d509acf7fe6a00ab4e6220"
- integrity sha512-px1NUkCLsD9UKLE4W4DghpyzmAVHgYhskrjRt30ubyUKqlggtHkOXRvS8MjuWowR/i0wF0GuTCbU9StBd7JMrw==
- dependencies:
- "@sentry/types" "7.101.0"
+"@sentry-internal/feedback@7.101.1":
+ version "7.101.1"
+ resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-7.101.1.tgz#d7e27ebcc46bd7306cfaa89b591293a394d75672"
+ integrity sha512-fOKDMVvLX+FuJHJszKBvRg1m7+fd4hchqRnZ9DDfitT6P5Ppl0gbEt/LStqu8Wq5M0tna+hpdwHlVEt7gZVKzw==
+ dependencies:
+ "@sentry/core" "7.101.1"
+ "@sentry/types" "7.101.1"
+ "@sentry/utils" "7.101.1"
+
+"@sentry-internal/replay-canvas@7.101.1":
+ version "7.101.1"
+ resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-7.101.1.tgz#6856431a6360dd456c693d0510410dcd46f28150"
+ integrity sha512-09l6nD+lxWvwkpXLlIZuzj/z79Llbo6mcH33TJvxrUTjAqSGF/i3Pd5bTLWro9atippOyQgIV/yTGG4Bc5FhyQ==
+ dependencies:
+ "@sentry/core" "7.101.1"
+ "@sentry/replay" "7.101.1"
+ "@sentry/types" "7.101.1"
+ "@sentry/utils" "7.101.1"
+
+"@sentry-internal/tracing@7.101.1":
+ version "7.101.1"
+ resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.101.1.tgz#9504e29c3c2c3ef5f652777e487b596cf8f78e1a"
+ integrity sha512-ihjWG8x4x0ozx6t+EHoXLKbsPrgzYLCpeBLWyS+M6n3hn6cmHM76c8nZw3ldhUQi5UYL3LFC/JZ50b4oSxtlrg==
+ dependencies:
+ "@sentry/core" "7.101.1"
+ "@sentry/types" "7.101.1"
+ "@sentry/utils" "7.101.1"
+
+"@sentry/browser@^7.101.1":
+ version "7.101.1"
+ resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.101.1.tgz#bab1257de499ed0e928bb4264a2e64d16cecccb5"
+ integrity sha512-+rIFoWPdO29AHVYsAwq8QEl2Ihv17Xh9Bt2aPFvLTGDA0caHjnx98g2jSOvLIOah6HI7Nwp3Njg2zBEzDtHkNw==
+ dependencies:
+ "@sentry-internal/feedback" "7.101.1"
+ "@sentry-internal/replay-canvas" "7.101.1"
+ "@sentry-internal/tracing" "7.101.1"
+ "@sentry/core" "7.101.1"
+ "@sentry/replay" "7.101.1"
+ "@sentry/types" "7.101.1"
+ "@sentry/utils" "7.101.1"
+
+"@sentry/core@7.101.1":
+ version "7.101.1"
+ resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.101.1.tgz#929841b7734129803b6dcd4d16bf0d3f53af4657"
+ integrity sha512-XSmXXeYT1d4O14eDF3OXPJFUgaN2qYEeIGUztqPX9nBs9/ij8y/kZOayFqlIMnfGvjOUM+63sy/2xDBOpFn6ug==
+ dependencies:
+ "@sentry/types" "7.101.1"
+ "@sentry/utils" "7.101.1"
+
+"@sentry/replay@7.101.1":
+ version "7.101.1"
+ resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.101.1.tgz#129ca5ac70690e78468b037a71a9b756bc3d965f"
+ integrity sha512-l4jmj2Rf/myzk3TA83PdMiomassG8okdBh1b2Hp1+ycBRVZFDmsR81gKPvnefSXwGwGNGKEmp6Q2bdGzekpp3Q==
+ dependencies:
+ "@sentry-internal/tracing" "7.101.1"
+ "@sentry/core" "7.101.1"
+ "@sentry/types" "7.101.1"
+ "@sentry/utils" "7.101.1"
+
+"@sentry/types@7.101.1":
+ version "7.101.1"
+ resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.101.1.tgz#7f936022d9b373f85ebf357634bf03a9e433a3d0"
+ integrity sha512-bwtkQvrCZ6JGc7vqX7TEAKBgkbQFORt84FFS3JQQb8G3efTt9fZd2ReY4buteKQdlALl8h1QWVngTLmI+kyUuw==
+
+"@sentry/utils@7.101.1":
+ version "7.101.1"
+ resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.101.1.tgz#97399b1e6a63a15e8f9fec5112ac4834239f1db6"
+ integrity sha512-Nrg0nrEI3nrOCd9SLJ/WGzxS5KMQE4cryLOvrDcHJRWpsSyGBF1hLLerk84Nsw/0myMsn7zTYU+xoq7idNsX5A==
+ dependencies:
+ "@sentry/types" "7.101.1"
"@sindresorhus/merge-streams@^1.0.0":
version "1.0.0"
From fb95d8e3f7af946991111c12fbd1462995851b1b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Feb 2024 00:59:15 +0000
Subject: [PATCH 06/53] Bump postcss-import from 16.0.0 to 16.0.1 (#2206)
---
package.json | 2 +-
yarn.lock | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
index 064d6a4f2..e2524551a 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
"postcss": "^8.4.35",
"postcss-cli": "^11.0.0",
"postcss-flexbugs-fixes": "^5.0.2",
- "postcss-import": "^16.0.0",
+ "postcss-import": "^16.0.1",
"postcss-preset-env": "^9.3.0",
"tailwindcss": "^3.4.1",
"webpack": "^5.76.0",
diff --git a/yarn.lock b/yarn.lock
index f63afcfbc..f97588e96 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1624,10 +1624,10 @@ postcss-import@^15.1.0:
read-cache "^1.0.0"
resolve "^1.1.7"
-postcss-import@^16.0.0:
- version "16.0.0"
- resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-16.0.0.tgz#2be1c78391b3f43f129fccfe5cc0cc1a11baef54"
- integrity sha512-e77lhVvrD1I2y7dYmBv0k9ULTdArgEYZt97T4w6sFIU5uxIHvDFQlKgUUyY7v7Barj0Yf/zm5A4OquZN7jKm5Q==
+postcss-import@^16.0.1:
+ version "16.0.1"
+ resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-16.0.1.tgz#c2e0478c5af8cb39ab3964c35d8fee8e70c362b8"
+ integrity sha512-i2Pci0310NaLHr/5JUFSw1j/8hf1CzwMY13g6ZDxgOavmRHQi2ba3PmUHoihO+sjaum+KmCNzskNsw7JDrg03g==
dependencies:
postcss-value-parser "^4.0.0"
read-cache "^1.0.0"
From ed4f6a3e577ff83bb94aa758c7bc1a4663cf7911 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Feb 2024 20:17:37 +0000
Subject: [PATCH 07/53] Bump pagy from 6.4.4 to 7.0.0 (#2208)
---
Gemfile | 2 +-
Gemfile.lock | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Gemfile b/Gemfile
index 7e614a583..c28c4d025 100644
--- a/Gemfile
+++ b/Gemfile
@@ -47,7 +47,7 @@ gem "view_component", "~> 3.10"
gem "rqrcode", "~> 2.2"
# Pagination!
-gem "pagy", "~> 6.4"
+gem "pagy", "~> 7.0"
# Database Layer
#
diff --git a/Gemfile.lock b/Gemfile.lock
index a954306f4..7720077c6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -295,7 +295,7 @@ GEM
nokogiri (1.16.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
- pagy (6.4.4)
+ pagy (7.0.0)
parallel (1.24.0)
parser (3.3.0.5)
ast (~> 2.4.1)
@@ -564,7 +564,7 @@ DEPENDENCIES
lockbox (= 1.3.3)
lookbook (>= 2.0.0.beta.4)
money-rails
- pagy (~> 6.4)
+ pagy (~> 7.0)
pg (~> 1.5)
pry-byebug
puma (~> 6.4)
From b27543811f949951dbe994d789039f74e093df4f Mon Sep 17 00:00:00 2001
From: Zee Spencer <50284+zspencer@users.noreply.github.com>
Date: Fri, 9 Feb 2024 17:12:07 -0800
Subject: [PATCH 08/53] =?UTF-8?q?=F0=9F=90=9E=F0=9F=94=A8`Marketplace`:=20?=
=?UTF-8?q?`Buying=20Products`=20with=20one=20unarchived=20`DeliveryArea`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- https://github.com/zinc-collective/convene/issues/2198
When we added [archiving delivery areas], I didn't take into account
that `Marketplace#cart_for_shopper` was checking against all the
delivery areas.
This fixes that and adds a system spec to make sure we can still
checkout after!
[archiving delivery areas]: https://github.com/zinc-collective/convene/pull/2024
---
app/furniture/marketplace/carts/_footer.html.erb | 1 +
app/furniture/marketplace/marketplace.rb | 2 +-
.../marketplace/buying_products_system_spec.rb | 13 +++++++++++++
spec/furniture/marketplace/marketplace_spec.rb | 9 +++++++++
4 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/app/furniture/marketplace/carts/_footer.html.erb b/app/furniture/marketplace/carts/_footer.html.erb
index 83e4d4b75..4d1b0b3a6 100644
--- a/app/furniture/marketplace/carts/_footer.html.erb
+++ b/app/furniture/marketplace/carts/_footer.html.erb
@@ -10,6 +10,7 @@
<%= render "marketplace/carts/total", cart: cart %>
+
<%- if cart.ready_for_checkout? %>
diff --git a/app/furniture/marketplace/marketplace.rb b/app/furniture/marketplace/marketplace.rb
index 769bb6ac2..0cd4a250a 100644
--- a/app/furniture/marketplace/marketplace.rb
+++ b/app/furniture/marketplace/marketplace.rb
@@ -132,7 +132,7 @@ def square_order_notifications_enabled?
end
def default_delivery_area
- (delivery_areas.size == 1) ? delivery_areas.first : nil
+ (delivery_areas.unarchived.size == 1) ? delivery_areas.unarchived.first : nil
end
end
end
diff --git a/spec/furniture/marketplace/buying_products_system_spec.rb b/spec/furniture/marketplace/buying_products_system_spec.rb
index c809259c7..7201f4d6a 100644
--- a/spec/furniture/marketplace/buying_products_system_spec.rb
+++ b/spec/furniture/marketplace/buying_products_system_spec.rb
@@ -50,6 +50,19 @@ def url_options
end
end
+ describe "when the `Marketplace` has one active `DeliveryArea`" do
+ it "allows Checkout" do
+ archived_delivery_area = create(:marketplace_delivery_area,
+ marketplace: marketplace, label: "Oakland", price_cents: 10_00)
+ archived_delivery_area.archive
+ visit(polymorphic_path(marketplace.room.location))
+
+ add_product_to_cart(marketplace.products.first)
+
+ expect { click_link("Checkout") }.not_to raise_error
+ end
+ end
+
it "Doesn't offer archived Products for sale" do
archived_product = create(:marketplace_product, :archived, marketplace:)
diff --git a/spec/furniture/marketplace/marketplace_spec.rb b/spec/furniture/marketplace/marketplace_spec.rb
index 959d88bf9..2c74993fe 100644
--- a/spec/furniture/marketplace/marketplace_spec.rb
+++ b/spec/furniture/marketplace/marketplace_spec.rb
@@ -64,6 +64,15 @@
cart = marketplace.cart_for_shopper(shopper:)
expect(cart.delivery_area).to be_nil
end
+
+ context "when only one of them is unarchived" do
+ before { marketplace.delivery_areas.first.archive }
+
+ it "sets the default delivery area to the single unarchived one" do
+ cart = marketplace.cart_for_shopper(shopper:)
+ expect(cart.delivery_area).to eq(marketplace.delivery_areas.unarchived.first)
+ end
+ end
end
end
From 90fe8699bb84bcbb80485b14e75ff95bab3cdf1c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 17 Feb 2024 00:00:20 +0000
Subject: [PATCH 09/53] Bump stripe from 10.8.0 to 10.9.0 (#2213)
---
Gemfile.lock | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index 7720077c6..f7f483671 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -499,7 +499,7 @@ GEM
stringio (3.1.0)
strip_attributes (1.13.0)
activemodel (>= 3.0, < 8.0)
- stripe (10.8.0)
+ stripe (10.9.0)
strong_migrations (1.7.0)
activerecord (>= 5.2)
thor (1.3.0)
From 243d2a33757f3a92af3ac55cab93f9856d3e2304 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 17 Feb 2024 00:00:29 +0000
Subject: [PATCH 10/53] Bump turbo-rails from 2.0.2 to 2.0.3 (#2212)
---
Gemfile.lock | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index f7f483671..a434daeae 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -504,7 +504,7 @@ GEM
activerecord (>= 5.2)
thor (1.3.0)
timeout (0.4.1)
- turbo-rails (2.0.2)
+ turbo-rails (2.0.3)
actionpack (>= 6.0.0)
activejob (>= 6.0.0)
railties (>= 6.0.0)
From 1dfde9619c40934bb298242a2232a7f4d4822bf5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 17 Feb 2024 00:05:45 +0000
Subject: [PATCH 11/53] Bump sidekiq from 7.2.1 to 7.2.2 (#2214)
---
Gemfile.lock | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index a434daeae..a91df461f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -371,7 +371,7 @@ GEM
rdoc (6.6.2)
psych (>= 4.0.0)
redcarpet (3.6.0)
- redis-client (0.19.1)
+ redis-client (0.20.0)
connection_pool
regexp_parser (2.9.0)
reline (0.4.2)
@@ -459,7 +459,7 @@ GEM
concurrent-ruby (~> 1.0, >= 1.0.2)
shoulda-matchers (6.1.0)
activesupport (>= 5.2.0)
- sidekiq (7.2.1)
+ sidekiq (7.2.2)
concurrent-ruby (< 2)
connection_pool (>= 2.3.0)
rack (>= 2.2.4)
From 3552a53e20b33eadd7d3291599250bfe08b8f0b9 Mon Sep 17 00:00:00 2001
From: Ross Chapman
Date: Fri, 16 Feb 2024 17:52:25 -0800
Subject: [PATCH 12/53] =?UTF-8?q?=F0=9F=8C=B8=E2=9C=A8=20`SectionNavigatio?=
=?UTF-8?q?n`=20and=20`Section`:=20Show=20`Section#hero=5Fimage`=20(#2188)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/components/card_component.html.erb | 16 +++++++++++-----
app/components/card_component.rb | 17 ++++++++++++++++-
.../marketplace/marketplace_component.html.erb | 4 ----
app/furniture/marketplace/product_component.rb | 6 +-----
.../_section_navigation.html.erb | 7 +------
app/models/media.rb | 5 +++++
app/views/furnitures/_furniture.html.erb | 4 +---
app/views/rooms/_room.html.erb | 3 +++
8 files changed, 38 insertions(+), 24 deletions(-)
diff --git a/app/components/card_component.html.erb b/app/components/card_component.html.erb
index dd83e6f4f..860ab3ed4 100644
--- a/app/components/card_component.html.erb
+++ b/app/components/card_component.html.erb
@@ -1,7 +1,14 @@
->
- <% if header? %>
- <%= header%>
- <%- end %>
+
>
+ <%- if head_image.present? %>
+
+ <%= image_tag head_image, class: "rounded-t-lg w-full" %>
+
+ <%= header %>
+
+
+ <%- else %>
+ <%= header %>
+ <%- end %>
<%#
NOTE: content? is not always working as described, and is returning a proc in some cases rather than a boolean
%>
@@ -10,7 +17,6 @@
<%= content %>
<% end %>
-
<% if footer? %>
<%= footer %>
<% end %>
diff --git a/app/components/card_component.rb b/app/components/card_component.rb
index c305f9f8a..20ce1a2a2 100644
--- a/app/components/card_component.rb
+++ b/app/components/card_component.rb
@@ -1,5 +1,16 @@
class CardComponent < ApplicationComponent
- HEADER_VARIANTS = {default: "p-2 sm:p-4", no_padding: ""}
+ attr_accessor :media
+
+ def initialize(media: nil, **kwargs)
+ super(**kwargs)
+
+ self.media = media
+ end
+
+ HEADER_VARIANTS = {
+ default: "p-2 sm:p-4",
+ no_padding: ""
+ }
renders_one :header, ->(variant: :default, &block) {
content_tag(:header, class: HEADER_VARIANTS.fetch(variant), &block)
}
@@ -14,4 +25,8 @@ class CardComponent < ApplicationComponent
classes += " rounded-t-none" unless content? || header?
content_tag(:footer, class: classes, &block)
}
+
+ def head_image
+ media&.upload&.variant(resize_to_fill: Media::FULL_WIDTH_16_BY_9)
+ end
end
diff --git a/app/furniture/marketplace/marketplace_component.html.erb b/app/furniture/marketplace/marketplace_component.html.erb
index ecdc2adaf..b85e316a7 100644
--- a/app/furniture/marketplace/marketplace_component.html.erb
+++ b/app/furniture/marketplace/marketplace_component.html.erb
@@ -1,9 +1,5 @@
-
-
<%= render delivery_area_component %>
-
<%= render Marketplace::MenuComponent.new(marketplace:, cart:) %>
-
<%= render cart %>
diff --git a/app/furniture/marketplace/product_component.rb b/app/furniture/marketplace/product_component.rb
index 0463c7aa0..e7ebc4fff 100644
--- a/app/furniture/marketplace/product_component.rb
+++ b/app/furniture/marketplace/product_component.rb
@@ -13,12 +13,8 @@ def edit_button
super(title: t("marketplace.products.edit.link_to", name: name), href: location(:edit))
end
- # 16:9 of 1290 is 1290:725.625
- # We rounded up.
- # @see https://www.ios-resolution.com/
- FULL_WIDTH_16_BY_9 = [1290, 726]
def hero_image
- product.photo.variant(resize_to_fill: FULL_WIDTH_16_BY_9)
+ product.photo.variant(resize_to_fill: Media::FULL_WIDTH_16_BY_9)
end
def tax_rates
diff --git a/app/furniture/section_navigation/section_navigations/_section_navigation.html.erb b/app/furniture/section_navigation/section_navigations/_section_navigation.html.erb
index 02024da27..e737fceec 100644
--- a/app/furniture/section_navigation/section_navigations/_section_navigation.html.erb
+++ b/app/furniture/section_navigation/section_navigations/_section_navigation.html.erb
@@ -1,13 +1,8 @@
<% policy_scope(section_navigation.rooms).each do |room| %>
<%= link_to polymorphic_path(room.location), id: dom_id(room, :link_to), class: "group no-underline" do %>
- <%= render CardComponent.new(classes:
- "flex flex-col h-full justify-between") do |card| %>
-
-
+ <%= render CardComponent.new(media: room.hero_image, classes: "flex flex-col justify-between") do |card| %>
<%= room.description %>
-
-
<%= room.name %>
diff --git a/app/models/media.rb b/app/models/media.rb
index 3d5ccce42..4ae1c9ad6 100644
--- a/app/models/media.rb
+++ b/app/models/media.rb
@@ -1,5 +1,10 @@
# The Media resource manages file uploads to the platform
class Media < ApplicationRecord
+ # 16:9 of 1290 is 1290:725.625
+ # We rounded up.
+ # @see https://www.ios-resolution.com/
+ FULL_WIDTH_16_BY_9 = [1290, 726]
+
# NOTE: Dependent destroy is defaulted, but when it becomes important to
# separate the destroy request and purge operations, let's add the
# `dependent: :purge_later` option.
diff --git a/app/views/furnitures/_furniture.html.erb b/app/views/furnitures/_furniture.html.erb
index f3dbf33d6..28ef082ee 100644
--- a/app/views/furnitures/_furniture.html.erb
+++ b/app/views/furnitures/_furniture.html.erb
@@ -1,7 +1,6 @@
<% edit_href = nil %>
<% edit_href = furniture.location(:edit) if furniture.configurable? %>
<% edit_href = furniture.to_kind_class.location(:edit) if furniture.to_kind_class.has_controller_edit? %>
-
<%- if local_assigns[:editing] %>
@@ -16,7 +15,6 @@
title: t('.edit_title', name: furniture.furniture.model_name.human.titleize),
scheme: :secondary) %>
<%- end %>
-
<%= render ButtonComponent.new(
label: t('icons.destroy'),
href: [furniture.room.space, furniture.room, furniture],
@@ -24,7 +22,7 @@
method: :delete,
confirm: t('.confirm_destroy'),
scheme: :secondary) %>
-
+
<%- if local_assigns[:include_form] %>
<%= render partial: 'furnitures/form', locals: { furniture: furniture } %>
diff --git a/app/views/rooms/_room.html.erb b/app/views/rooms/_room.html.erb
index af2c9ac43..e8da5a578 100644
--- a/app/views/rooms/_room.html.erb
+++ b/app/views/rooms/_room.html.erb
@@ -1,6 +1,9 @@
+ <%- if room.hero_image&.upload.present? %>
+ <%= image_tag room.hero_image&.upload&.variant(resize_to_fill: Media::FULL_WIDTH_16_BY_9), class: "w-full" %>
+ <%- end %>
<%= render room.gizmos.rank(:slot) %>
From 30a6753f570c2ed0622b02801a7d6dc7eec4374c Mon Sep 17 00:00:00 2001
From: Zee <50284+zspencer@users.noreply.github.com>
Date: Sat, 17 Feb 2024 09:52:57 -0800
Subject: [PATCH 13/53] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20`Gizmos`:=20Support?=
=?UTF-8?q?=20`ActionText`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- https://github.com/zinc-collective/convene/issues/709
- https://github.com/zinc-collective/convene/pull/2200#pullrequestreview-1879198110
- https://github.com/zinc-collective/convene/pull/2211
Markdown is cool, but it's nerd-forward.
ActionText is a much more human-friendly way of implementing rich text
in Rails applications.
I don't know enough about [Trix] to know if it will work in multi-user
contexts; or how it will work with rich-embeds, ala Notion or Google Docs
But I think it's a good-enough-default for now; and if we get to the point
where embeddables or multi-user editing of a field is important we can
figure that out.
[Trix]: https://trix-editor.org/
---
app/assets/stylesheets/actiontext.css | 36 +++++++++++++++++++
.../stylesheets/application.postcss.css | 1 +
app/javascript/application.js | 3 ++
app/views/active_storage/blobs/_blob.html.erb | 14 ++++++++
.../action_text/contents/_content.html.erb | 3 ++
...9_create_action_text_tables.action_text.rb | 27 ++++++++++++++
db/schema.rb | 12 ++++++-
package.json | 2 ++
spec/rails_helper.rb | 13 +++----
spec/spec_helper.rb | 7 ++--
yarn.lock | 14 +++++++-
11 files changed, 120 insertions(+), 12 deletions(-)
create mode 100644 app/assets/stylesheets/actiontext.css
create mode 100644 app/views/active_storage/blobs/_blob.html.erb
create mode 100644 app/views/layouts/action_text/contents/_content.html.erb
create mode 100644 db/migrate/20240216213129_create_action_text_tables.action_text.rb
diff --git a/app/assets/stylesheets/actiontext.css b/app/assets/stylesheets/actiontext.css
new file mode 100644
index 000000000..f325379b3
--- /dev/null
+++ b/app/assets/stylesheets/actiontext.css
@@ -0,0 +1,36 @@
+/*
+ * Provides a drop-in pointer for the default Trix stylesheet that will format the toolbar and
+ * the trix-editor content (whether displayed or under editing). Feel free to incorporate this
+ * inclusion directly in any other asset bundle and remove this file.
+ *
+ *= require trix
+*/
+
+/*
+ * We need to override trix.css’s image gallery styles to accommodate the
+ *
element we wrap around attachments. Otherwise,
+ * images in galleries will be squished by the max-width: 33%; rule.
+*/
+.trix-content .attachment-gallery > action-text-attachment,
+.trix-content .attachment-gallery > .attachment {
+ flex: 1 0 33%;
+ padding: 0 0.5em;
+ max-width: 33%;
+}
+
+.trix-content
+ .attachment-gallery.attachment-gallery--2
+ > action-text-attachment,
+.trix-content .attachment-gallery.attachment-gallery--2 > .attachment,
+.trix-content
+ .attachment-gallery.attachment-gallery--4
+ > action-text-attachment,
+.trix-content .attachment-gallery.attachment-gallery--4 > .attachment {
+ flex-basis: 50%;
+ max-width: 50%;
+}
+
+.trix-content action-text-attachment .attachment {
+ padding: 0 !important;
+ max-width: 100% !important;
+}
diff --git a/app/assets/stylesheets/application.postcss.css b/app/assets/stylesheets/application.postcss.css
index 43128e8b4..ff9af79db 100644
--- a/app/assets/stylesheets/application.postcss.css
+++ b/app/assets/stylesheets/application.postcss.css
@@ -7,3 +7,4 @@
@import "./utilities.scss";
@import "./components.scss";
+@import "actiontext.css";
diff --git a/app/javascript/application.js b/app/javascript/application.js
index 341c48ae1..d170874c4 100644
--- a/app/javascript/application.js
+++ b/app/javascript/application.js
@@ -15,3 +15,6 @@ ActiveStorage.start();
import "@hotwired/turbo-rails";
import "./controllers/index.js";
+
+import "trix";
+import "@rails/actiontext";
diff --git a/app/views/active_storage/blobs/_blob.html.erb b/app/views/active_storage/blobs/_blob.html.erb
new file mode 100644
index 000000000..49ba357dd
--- /dev/null
+++ b/app/views/active_storage/blobs/_blob.html.erb
@@ -0,0 +1,14 @@
+ attachment--<%= blob.filename.extension %>">
+ <% if blob.representable? %>
+ <%= image_tag blob.representation(resize_to_limit: local_assigns[:in_gallery] ? [ 800, 600 ] : [ 1024, 768 ]) %>
+ <% end %>
+
+
+ <% if caption = blob.try(:caption) %>
+ <%= caption %>
+ <% else %>
+ <%= blob.filename %>
+ <%= number_to_human_size blob.byte_size %>
+ <% end %>
+
+
diff --git a/app/views/layouts/action_text/contents/_content.html.erb b/app/views/layouts/action_text/contents/_content.html.erb
new file mode 100644
index 000000000..9e3c0d0df
--- /dev/null
+++ b/app/views/layouts/action_text/contents/_content.html.erb
@@ -0,0 +1,3 @@
+
+ <%= yield -%>
+
diff --git a/db/migrate/20240216213129_create_action_text_tables.action_text.rb b/db/migrate/20240216213129_create_action_text_tables.action_text.rb
new file mode 100644
index 000000000..c18655343
--- /dev/null
+++ b/db/migrate/20240216213129_create_action_text_tables.action_text.rb
@@ -0,0 +1,27 @@
+# This migration comes from action_text (originally 20180528164100)
+class CreateActionTextTables < ActiveRecord::Migration[6.0]
+ def change
+ # Use Active Record's configured type for primary and foreign keys
+ primary_key_type, foreign_key_type = primary_and_foreign_key_types
+
+ create_table :action_text_rich_texts, id: primary_key_type do |t|
+ t.string :name, null: false
+ t.text :body, size: :long
+ t.references :record, null: false, polymorphic: true, index: false, type: foreign_key_type
+
+ t.timestamps
+
+ t.index [:record_type, :record_id, :name], name: "index_action_text_rich_texts_uniqueness", unique: true
+ end
+ end
+
+ private
+
+ def primary_and_foreign_key_types
+ config = Rails.configuration.generators
+ setting = config.options[config.orm][:primary_key_type]
+ primary_key_type = setting || :primary_key
+ foreign_key_type = setting || :bigint
+ [primary_key_type, foreign_key_type]
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index f32e29002..b9c08f79b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.1].define(version: 2024_02_07_040004) do
+ActiveRecord::Schema[7.1].define(version: 2024_02_16_213129) do
# These are extensions that must be enabled in order to support this database
enable_extension "pgcrypto"
enable_extension "plpgsql"
@@ -30,6 +30,16 @@
"revoked",
], force: :cascade
+ create_table "action_text_rich_texts", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+ t.string "name", null: false
+ t.text "body"
+ t.string "record_type", null: false
+ t.uuid "record_id", null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.index ["record_type", "record_id", "name"], name: "index_action_text_rich_texts_uniqueness", unique: true
+ end
+
create_table "active_storage_attachments", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
t.string "name", null: false
t.string "record_type", null: false
diff --git a/package.json b/package.json
index e2524551a..65f729313 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,7 @@
"@hotwired/stimulus-webpack-helpers": "^1.0.1",
"@hotwired/turbo-rails": "^8.0.2",
"@rails/actioncable": "^7.1.3",
+ "@rails/actiontext": "^7.1.3",
"@rails/activestorage": "^7.1.3",
"@sentry/browser": "^7.101.1",
"@tailwindcss/forms": "^0.5.7",
@@ -49,6 +50,7 @@
"postcss-import": "^16.0.1",
"postcss-preset-env": "^9.3.0",
"tailwindcss": "^3.4.1",
+ "trix": "^2.0.10",
"webpack": "^5.76.0",
"webpack-cli": "^5.1.4"
}
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 08b3502c6..c6d16eb65 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -1,7 +1,7 @@
# This file is copied to spec/ when you run 'rails generate rspec:install'
require "spec_helper"
ENV["RAILS_ENV"] ||= "test"
-require File.expand_path("../config/environment", __dir__)
+require_relative "../config/environment"
# Prevent database truncation if the environment is production
abort("The Rails environment is running in production mode!") if Rails.env.production?
require "rspec/rails"
@@ -20,19 +20,20 @@
# directory. Alternatively, in the individual `*_spec.rb` files, manually
# require only the support files necessary.
#
-Dir[Rails.root.join("spec", "support", "**", "*.rb")].sort.each { |f| require f }
+Rails.root.glob("spec/support/**/*.rb").sort.each { |f| require f }
# Checks for pending migrations and applies them before tests are run.
# If you are not using ActiveRecord, you can remove these lines.
begin
ActiveRecord::Migration.maintain_test_schema!
rescue ActiveRecord::PendingMigrationError => e
- puts e.to_s.strip
- exit 1
+ abort e.to_s.strip
end
RSpec.configure do |config|
# Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
- config.fixture_paths = ["#{::Rails.root}/spec/fixtures"]
+ config.fixture_paths = [
+ 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
@@ -54,7 +55,7 @@
# end
#
# The different available types are documented in the features, such as in
- # https://relishapp.com/rspec/rspec-rails/docs
+ # https://rspec.info/features/6-0/rspec-rails
config.infer_spec_type_from_file_location!
# Filter lines from Rails gems in backtraces.
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 0cc9fbf52..24c3d8ae7 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -22,7 +22,7 @@
# the additional setup, and require it from the spec files that actually need
# it.
#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+# See https://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
RSpec.configure do |config|
# rspec-expectations config goes here. You can use an alternate
# assertion/expectation library such as wrong or the stdlib/minitest
@@ -56,6 +56,7 @@
config.define_derived_metadata do |meta|
meta[:aggregate_failures] = true
end
+
# The settings below are suggested to provide a good initial experience
# with RSpec, but feel free to customize to your heart's content.
# # This allows you to limit a spec run to individual examples or groups
@@ -72,9 +73,7 @@
#
# # Limits the available syntax to the non-monkey patched syntax that is
# # recommended. For more details, see:
- # # - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
- # # - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
- # # - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
+ # # https://rspec.info/features/3-12/rspec-core/configuration/zero-monkey-patching-mode/
# config.disable_monkey_patching!
#
# # Many RSpec users commonly either run the entire suite or an individual
diff --git a/yarn.lock b/yarn.lock
index f97588e96..2ba3a4503 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -373,7 +373,14 @@
resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.1.3.tgz#4db480347775aeecd4dde2405659eef74a458881"
integrity sha512-ojNvnoZtPN0pYvVFtlO7dyEN9Oml1B6IDM+whGKVak69MMYW99lC2NOWXWeE3bmwEydbP/nn6ERcpfjHVjYQjA==
-"@rails/activestorage@^7.1.3":
+"@rails/actiontext@^7.1.3":
+ version "7.1.3"
+ resolved "https://registry.yarnpkg.com/@rails/actiontext/-/actiontext-7.1.3.tgz#1b7aa2732c45cbc8a5708c54457c16fb81ce3da3"
+ integrity sha512-jwY0LJ0xpyIWkYs6BUMY4RcwVA3jZ+bFDPvv5KpKQnw+24BhJVtBLqF0XIsROaRCyabakueRyVuSG9NNhnLTvA==
+ dependencies:
+ "@rails/activestorage" ">= 7.1.0-alpha"
+
+"@rails/activestorage@>= 7.1.0-alpha", "@rails/activestorage@^7.1.3":
version "7.1.3"
resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-7.1.3.tgz#e83ece6c5fd94b3ddf30a8cf3b8f78cad049e596"
integrity sha512-B+RFYAU8vdTPFg0IJcRp2ey0Qw9hpcUOqHHcWqftDJ76ZMBi9+m/UUeMJlNsSd0l9eD+1HLlFSo1X//cY4yiDw==
@@ -2109,6 +2116,11 @@ to-regex-range@^5.0.1:
dependencies:
is-number "^7.0.0"
+trix@^2.0.10:
+ version "2.0.10"
+ resolved "https://registry.yarnpkg.com/trix/-/trix-2.0.10.tgz#43f1ff7a94c42f708bd2bad3a2783147c0583698"
+ integrity sha512-a24w8rNVL+g9nDDdiDZwQVQ9AEWiXAmk9r0ZbwimczJi/xlaM+m0d6upAi0vysDNu0HsiYDFS1/VrR7HbX0Aig==
+
ts-interface-checker@^0.1.9:
version "0.1.13"
resolved "https://registry.yarnpkg.com/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz#784fd3d679722bc103b1b4b8030bcddb5db2a699"
From 6b72cfc424b500fb13b2a116ca0c67d5a6b0c253 Mon Sep 17 00:00:00 2001
From: Zee <50284+zspencer@users.noreply.github.com>
Date: Sat, 17 Feb 2024 10:00:24 -0800
Subject: [PATCH 14/53] =?UTF-8?q?=F0=9F=8C=B8=20`Section#hero=5Fimage`:=20?=
=?UTF-8?q?takes=20less=20screen=20real-estate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- https://github.com/zinc-collective/convene/issues/1961
- https://github.com/zinc-collective/convene/pull/2194
This brings the hero image to the Section, and makes it take up a
reasonable amount of space.
---
app/assets/stylesheets/base/layout.scss | 2 +-
app/models/media.rb | 1 +
app/views/rooms/_room.html.erb | 6 +++---
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/app/assets/stylesheets/base/layout.scss b/app/assets/stylesheets/base/layout.scss
index ab5b3b3f8..fd0b29baf 100644
--- a/app/assets/stylesheets/base/layout.scss
+++ b/app/assets/stylesheets/base/layout.scss
@@ -5,7 +5,7 @@
}
main {
- @apply mx-2 flex-1 flex flex-col;
+ @apply flex-1 flex flex-col;
> :last-child {
@apply mb-2;
}
diff --git a/app/models/media.rb b/app/models/media.rb
index 4ae1c9ad6..ab4d5fabd 100644
--- a/app/models/media.rb
+++ b/app/models/media.rb
@@ -4,6 +4,7 @@ class Media < ApplicationRecord
# We rounded up.
# @see https://www.ios-resolution.com/
FULL_WIDTH_16_BY_9 = [1290, 726]
+ FULL_WIDTH_SHORT = [1728, 480]
# NOTE: Dependent destroy is defaulted, but when it becomes important to
# separate the destroy request and purge operations, let's add the
diff --git a/app/views/rooms/_room.html.erb b/app/views/rooms/_room.html.erb
index e8da5a578..74e76616d 100644
--- a/app/views/rooms/_room.html.erb
+++ b/app/views/rooms/_room.html.erb
@@ -1,9 +1,9 @@
+<%- if room.hero_image&.upload.present? %>
+ <%= image_tag room.hero_image&.upload&.variant(resize_to_fill: Media::FULL_WIDTH_SHORT), class: "w-full" %>
+<%- end %>
- <%- if room.hero_image&.upload.present? %>
- <%= image_tag room.hero_image&.upload&.variant(resize_to_fill: Media::FULL_WIDTH_16_BY_9), class: "w-full" %>
- <%- end %>
<%= render room.gizmos.rank(:slot) %>
From f9c99c2ac576118f07da962efd9c26ce7efc5cef Mon Sep 17 00:00:00 2001
From: Zee Spencer <50284+zspencer@users.noreply.github.com>
Date: Sun, 18 Feb 2024 10:18:12 -0800
Subject: [PATCH 15/53] =?UTF-8?q?=F0=9F=8C=B8=20`Marketplace`:=20De-italic?=
=?UTF-8?q?ize-all-things?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- https://github.com/zinc-collective/convene/issues/831
- https://github.com/zinc-collective/convene/issues/1325
- https://github.com/zinc-collective/convene/issues/2153
- https://github.com/zinc-collective/convene/issues/2215
- https://github.com/zinc-collective/convene/issues/1137
- https://github.com/zinc-collective/convene/issues/2169
@anaulin has mentioned at least twice how she despises italics; but no
one has taken on the task.
So I did a quick skim-through for all the `italic` that lives within the
`Marketplace`, and removed them in place of:
- Making text size smaller
- Making text color grayer
---
.../marketplace/cart/deliveries/_delivery.html.erb | 4 ++--
app/furniture/marketplace/delivery_area_component.html.erb | 4 ++--
app/furniture/marketplace/menu/product_component.html.erb | 2 +-
.../marketplace/order/email_receipt_component.html.erb | 2 +-
app/furniture/marketplace/orders/_order.html.erb | 6 +++---
app/furniture/marketplace/product_component.html.erb | 6 +++---
app/furniture/marketplace/tax_rate_component.html.erb | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/app/furniture/marketplace/cart/deliveries/_delivery.html.erb b/app/furniture/marketplace/cart/deliveries/_delivery.html.erb
index 0a2b34af7..9a1ef53b9 100644
--- a/app/furniture/marketplace/cart/deliveries/_delivery.html.erb
+++ b/app/furniture/marketplace/cart/deliveries/_delivery.html.erb
@@ -4,7 +4,7 @@
Delivering to:
<%= render(delivery.delivery_area) %>
- <%= render(Marketplace::Cart::DeliveryExpectationsComponent.new(cart: delivery.cart)) %>
+ <%= render(Marketplace::Cart::DeliveryExpectationsComponent.new(cart: delivery.cart)) %>
@@ -13,7 +13,7 @@
<%= number_to_phone(delivery.contact_phone_number) %>
<%= delivery.delivery_address %>
-
<%= delivery.delivery_notes %>
+
<%= delivery.delivery_notes %>
<%= link_to(t("marketplace.cart.deliveries.edit.link_to"), delivery.location(:edit)) %>
diff --git a/app/furniture/marketplace/delivery_area_component.html.erb b/app/furniture/marketplace/delivery_area_component.html.erb
index 10b2363d7..1539b282a 100644
--- a/app/furniture/marketplace/delivery_area_component.html.erb
+++ b/app/furniture/marketplace/delivery_area_component.html.erb
@@ -6,7 +6,7 @@
<%- if delivery_area.archived? %>
-
(archived)
+
(archived)
<%- end %>
<%- end %>
@@ -15,7 +15,7 @@
<%= render Marketplace::Cart::DeliveryExpectationsComponent.new(order_by: delivery_area.order_by, delivery_window: delivery_area.delivery_window, cart: example_cart) %>
-
diff --git a/app/furniture/marketplace/menu/product_component.html.erb b/app/furniture/marketplace/menu/product_component.html.erb
index d9f610162..1c05632eb 100644
--- a/app/furniture/marketplace/menu/product_component.html.erb
+++ b/app/furniture/marketplace/menu/product_component.html.erb
@@ -16,7 +16,7 @@
<% end %>
-
+
<%= description %>
diff --git a/app/furniture/marketplace/order/email_receipt_component.html.erb b/app/furniture/marketplace/order/email_receipt_component.html.erb
index 05cdef8fa..8feba2698 100644
--- a/app/furniture/marketplace/order/email_receipt_component.html.erb
+++ b/app/furniture/marketplace/order/email_receipt_component.html.erb
@@ -10,7 +10,7 @@
<%= link_to "Order #{order.id}", order.persisted? ? order.location : "#" %>
-
+
<%= placed_at %>
diff --git a/app/furniture/marketplace/orders/_order.html.erb b/app/furniture/marketplace/orders/_order.html.erb
index 861cdc944..0203aee07 100644
--- a/app/furniture/marketplace/orders/_order.html.erb
+++ b/app/furniture/marketplace/orders/_order.html.erb
@@ -14,10 +14,10 @@
<%= humanized_money_with_symbol(ordered_product.price) %>
<%- if ordered_product.tax_amount.positive? %>
-
+
<%= ordered_product.tax_rates.map(&:label).to_sentence %>
- <%= humanized_money_with_symbol(ordered_product.tax_amount) %>
+ <%= humanized_money_with_symbol(ordered_product.tax_amount) %>
<%- end %>
<%- end %>
@@ -35,7 +35,7 @@
<%- order.events.each do |event| %>
<%= event.description%>
-
<%= l(event.created_at, format: :long_ordinal) %>
+
<%= l(event.created_at, format: :long_ordinal) %>
<%- end %>
diff --git a/app/furniture/marketplace/product_component.html.erb b/app/furniture/marketplace/product_component.html.erb
index aa3c4b5c5..07067b068 100644
--- a/app/furniture/marketplace/product_component.html.erb
+++ b/app/furniture/marketplace/product_component.html.erb
@@ -6,7 +6,7 @@
<%= render Marketplace::Product::TitleComponent.new(product:) %>
<%- if product.archived? %>
- (archived)
+ (archived)
<%- end %>
@@ -17,12 +17,12 @@
<%- end %>
<%- end %>
-
+
<%= description %>
-
+
<%= tax_rates %>
<%= price %>
diff --git a/app/furniture/marketplace/tax_rate_component.html.erb b/app/furniture/marketplace/tax_rate_component.html.erb
index 516f974d0..9da59c56c 100644
--- a/app/furniture/marketplace/tax_rate_component.html.erb
+++ b/app/furniture/marketplace/tax_rate_component.html.erb
@@ -3,7 +3,7 @@
<%= label %>
<%- end %>
-
+
<%= rate %>
From bd4a37e4aa81cb594728154fccd0568b7e2605b7 Mon Sep 17 00:00:00 2001
From: Zee <50284+zspencer@users.noreply.github.com>
Date: Tue, 20 Feb 2024 10:25:38 -0800
Subject: [PATCH 16/53] =?UTF-8?q?=F0=9F=8C=B8=20`Space`:=20De-italicize=20?=
=?UTF-8?q?help-text=20on=20`Space#edit`=20(#2223)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- https://github.com/zinc-collective/convene/issues/1364
- https://github.com/zinc-collective/convene/issues/252
- https://github.com/zinc-collective/convene/issues/1513
Remove Moar italics! MOAR!
---
app/views/spaces/_agreements.html.erb | 2 +-
app/views/spaces/_utilities.html.erb | 2 +-
app/views/spaces/_website_settings.html.erb | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/views/spaces/_agreements.html.erb b/app/views/spaces/_agreements.html.erb
index 64a86765c..89e9124f3 100644
--- a/app/views/spaces/_agreements.html.erb
+++ b/app/views/spaces/_agreements.html.erb
@@ -1,7 +1,7 @@
<%= render CardComponent.new(classes: "mt-3 gap-y-3") do %>
<%- space.agreements.each do |agreement| %>
diff --git a/app/views/spaces/_utilities.html.erb b/app/views/spaces/_utilities.html.erb
index 08b70f036..ebfd4f8b7 100644
--- a/app/views/spaces/_utilities.html.erb
+++ b/app/views/spaces/_utilities.html.erb
@@ -1,7 +1,7 @@
<%= render CardComponent.new(classes: "mt-3 gap-y-3") do %>
- <%== pagy_nav(@pagy, nav_extra: 'flex justify-between') %>
+ <%== pagy_nav(@pagy) %>
<%= render Journal::NewEntryButtonComponent.new(journal: journal) %>
diff --git a/app/furniture/marketplace/orders/index.html.erb b/app/furniture/marketplace/orders/index.html.erb
index 33a4ae9de..9191ad744 100644
--- a/app/furniture/marketplace/orders/index.html.erb
+++ b/app/furniture/marketplace/orders/index.html.erb
@@ -2,5 +2,5 @@
<%- @pagy, @records = pagy(orders.paid) %>
<%= render @records %>
- <%== pagy_nav(@pagy, nav_extra: 'flex justify-between mt-4') %>
+ <%== pagy_nav(@pagy) %>
diff --git a/app/helpers/pagy_helper.rb b/app/helpers/pagy_helper.rb
index 95599c572..6b1a93e5c 100644
--- a/app/helpers/pagy_helper.rb
+++ b/app/helpers/pagy_helper.rb
@@ -1,35 +1,4 @@
module PagyHelper
include Pagy::Backend
include Pagy::Frontend
-
- # @todo submit a patch to Pagy which allows us to override the classes using `nav_extra`
- # since there wasn't a tidy seam to inject tailwind classes on the container beyond
- # copy-paste-and-replace
- def pagy_nav(pagy, pagy_id: nil, link_extra: "", nav_extra: "", **)
- p_id = %( id="#{pagy_id}") if pagy_id
- link = pagy_link_proc(pagy, link_extra: link_extra)
- p_prev = pagy.prev
- p_next = pagy.next
-
- html = +%()
- end
end
diff --git a/app/views/neighborhoods/show.html.erb b/app/views/neighborhoods/show.html.erb
index 318ee160d..2afbedbd0 100644
--- a/app/views/neighborhoods/show.html.erb
+++ b/app/views/neighborhoods/show.html.erb
@@ -5,7 +5,7 @@
<%= render @records %>
- <%== pagy_nav(@pagy, nav_extra: 'flex justify-between') %>
+ <%== pagy_nav(@pagy) %>
<%- if policy(Space).new? %>
From 9ac1ad126a532e8df58b811b219e7458ca211b57 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Feb 2024 18:33:22 +0000
Subject: [PATCH 22/53] Bump webmock from 3.20.0 to 3.21.0 (#2226)
---
Gemfile.lock | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index 508eef96b..dd9b2863c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -153,7 +153,7 @@ GEM
coderay (1.1.3)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
- crack (0.4.6)
+ crack (1.0.0)
bigdecimal
rexml
crass (1.0.6)
@@ -521,7 +521,7 @@ GEM
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
railties (>= 6.0.0)
- webmock (3.20.0)
+ webmock (3.21.0)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
From 7a23f98724070c71545266de2833dad5eba418fc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Feb 2024 02:23:10 +0000
Subject: [PATCH 23/53] Bump selenium-webdriver from 4.18.0 to 4.18.1 (#2231)
---
Gemfile.lock | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index dd9b2863c..2fc6d5761 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -447,7 +447,7 @@ GEM
ffi (~> 1.12)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
- selenium-webdriver (4.18.0)
+ selenium-webdriver (4.18.1)
base64 (~> 0.2)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
From 8341a1c25465c837f2a41f1a237d2c8ba3b435c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Feb 2024 02:23:19 +0000
Subject: [PATCH 24/53] Bump pagy from 7.0.2 to 7.0.3 (#2229)
---
Gemfile.lock | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index 2fc6d5761..795ca89d6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -295,7 +295,7 @@ GEM
nokogiri (1.16.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
- pagy (7.0.2)
+ pagy (7.0.3)
parallel (1.24.0)
parser (3.3.0.5)
ast (~> 2.4.1)
From 387ccd6f24624a2c3cb92165bb67d6940f0dde9a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Feb 2024 23:54:24 +0000
Subject: [PATCH 25/53] Bump @hotwired/turbo-rails from 8.0.2 to 8.0.3 (#2233)
---
package.json | 2 +-
yarn.lock | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/package.json b/package.json
index 176fcdfc4..523aa673b 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
"dependencies": {
"@hotwired/stimulus": "^3.2.2",
"@hotwired/stimulus-webpack-helpers": "^1.0.1",
- "@hotwired/turbo-rails": "^8.0.2",
+ "@hotwired/turbo-rails": "^8.0.3",
"@rails/actioncable": "^7.1.3",
"@rails/actiontext": "^7.1.3",
"@rails/activestorage": "^7.1.3",
diff --git a/yarn.lock b/yarn.lock
index 95fcaec3d..bda167767 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -311,18 +311,18 @@
resolved "https://registry.yarnpkg.com/@hotwired/stimulus/-/stimulus-3.2.2.tgz#071aab59c600fed95b97939e605ff261a4251608"
integrity sha512-eGeIqNOQpXoPAIP7tC1+1Yc1yl1xnwYqg+3mzqxyrbE5pg5YFBZcA6YoTiByJB6DKAEsiWtl6tjTJS4IYtbB7A==
-"@hotwired/turbo-rails@^8.0.2":
- version "8.0.2"
- resolved "https://registry.yarnpkg.com/@hotwired/turbo-rails/-/turbo-rails-8.0.2.tgz#c43d54d9346bcf14c897166556bfed92ed4c1d17"
- integrity sha512-j+6THPc+CsaUdUXZTg6wQ+YcStO9kn6CuGzElqFxUmV/vyd1Jfm0RLZMIbaY8w9Qse7u6JBcrm4AcRxhIhYmaQ==
+"@hotwired/turbo-rails@^8.0.3":
+ version "8.0.3"
+ resolved "https://registry.yarnpkg.com/@hotwired/turbo-rails/-/turbo-rails-8.0.3.tgz#e60375f4eea4b30ec0cd6d7e3fdb3d6349a2b57b"
+ integrity sha512-n5B9HdFsNiGJfXFAriCArmvFZyznIh/OriB5ZVAWz4Fsi4oLkpgmJNw5pibBAM7NMQQGN6cfKa/nhZT4LWcqbQ==
dependencies:
- "@hotwired/turbo" "^8.0.2"
+ "@hotwired/turbo" "^8.0.3"
"@rails/actioncable" "^7.0"
-"@hotwired/turbo@^8.0.2":
- version "8.0.2"
- resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-8.0.2.tgz#c31cdadfe66b98983066a94073b26fc7e15835f0"
- integrity sha512-3K6QZkwWfosAV8zuM5bY+kKF02jp1lMQGsWfSE6wXdZBRBP3ah+Vj26YNqYtkEomBwRWA0QKhZgyJP7xOQkVEg==
+"@hotwired/turbo@^8.0.3":
+ version "8.0.3"
+ resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-8.0.3.tgz#338e07278f4b3c76921328d3c92dbc4831c209d0"
+ integrity sha512-qLgp7d6JaegKjMToTJahosrFxV3odfSbiekispQ3soOzE5jnU+iEMWlRvYRe/jvy5Q+JWoywtf9j3RD4ikVjIg==
"@jridgewell/gen-mapping@^0.3.0":
version "0.3.2"
From 71c7658a9a2fb509d10846c73dfdca9e23616526 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Feb 2024 23:58:56 +0000
Subject: [PATCH 26/53] Bump @sentry/browser from 7.101.1 to 7.102.0 (#2232)
---
package.json | 2 +-
yarn.lock | 140 +++++++++++++++++++++++++--------------------------
2 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/package.json b/package.json
index 523aa673b..0aa3d982b 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
"@rails/actioncable": "^7.1.3",
"@rails/actiontext": "^7.1.3",
"@rails/activestorage": "^7.1.3",
- "@sentry/browser": "^7.101.1",
+ "@sentry/browser": "^7.102.0",
"@tailwindcss/forms": "^0.5.7",
"@tailwindcss/typography": "^0.5.10",
"@webpack-cli/serve": "^2.0.5",
diff --git a/yarn.lock b/yarn.lock
index bda167767..312993241 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -413,76 +413,76 @@
dependencies:
spark-md5 "^3.0.1"
-"@sentry-internal/feedback@7.101.1":
- version "7.101.1"
- resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-7.101.1.tgz#d7e27ebcc46bd7306cfaa89b591293a394d75672"
- integrity sha512-fOKDMVvLX+FuJHJszKBvRg1m7+fd4hchqRnZ9DDfitT6P5Ppl0gbEt/LStqu8Wq5M0tna+hpdwHlVEt7gZVKzw==
- dependencies:
- "@sentry/core" "7.101.1"
- "@sentry/types" "7.101.1"
- "@sentry/utils" "7.101.1"
-
-"@sentry-internal/replay-canvas@7.101.1":
- version "7.101.1"
- resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-7.101.1.tgz#6856431a6360dd456c693d0510410dcd46f28150"
- integrity sha512-09l6nD+lxWvwkpXLlIZuzj/z79Llbo6mcH33TJvxrUTjAqSGF/i3Pd5bTLWro9atippOyQgIV/yTGG4Bc5FhyQ==
- dependencies:
- "@sentry/core" "7.101.1"
- "@sentry/replay" "7.101.1"
- "@sentry/types" "7.101.1"
- "@sentry/utils" "7.101.1"
-
-"@sentry-internal/tracing@7.101.1":
- version "7.101.1"
- resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.101.1.tgz#9504e29c3c2c3ef5f652777e487b596cf8f78e1a"
- integrity sha512-ihjWG8x4x0ozx6t+EHoXLKbsPrgzYLCpeBLWyS+M6n3hn6cmHM76c8nZw3ldhUQi5UYL3LFC/JZ50b4oSxtlrg==
- dependencies:
- "@sentry/core" "7.101.1"
- "@sentry/types" "7.101.1"
- "@sentry/utils" "7.101.1"
-
-"@sentry/browser@^7.101.1":
- version "7.101.1"
- resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.101.1.tgz#bab1257de499ed0e928bb4264a2e64d16cecccb5"
- integrity sha512-+rIFoWPdO29AHVYsAwq8QEl2Ihv17Xh9Bt2aPFvLTGDA0caHjnx98g2jSOvLIOah6HI7Nwp3Njg2zBEzDtHkNw==
- dependencies:
- "@sentry-internal/feedback" "7.101.1"
- "@sentry-internal/replay-canvas" "7.101.1"
- "@sentry-internal/tracing" "7.101.1"
- "@sentry/core" "7.101.1"
- "@sentry/replay" "7.101.1"
- "@sentry/types" "7.101.1"
- "@sentry/utils" "7.101.1"
-
-"@sentry/core@7.101.1":
- version "7.101.1"
- resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.101.1.tgz#929841b7734129803b6dcd4d16bf0d3f53af4657"
- integrity sha512-XSmXXeYT1d4O14eDF3OXPJFUgaN2qYEeIGUztqPX9nBs9/ij8y/kZOayFqlIMnfGvjOUM+63sy/2xDBOpFn6ug==
- dependencies:
- "@sentry/types" "7.101.1"
- "@sentry/utils" "7.101.1"
-
-"@sentry/replay@7.101.1":
- version "7.101.1"
- resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.101.1.tgz#129ca5ac70690e78468b037a71a9b756bc3d965f"
- integrity sha512-l4jmj2Rf/myzk3TA83PdMiomassG8okdBh1b2Hp1+ycBRVZFDmsR81gKPvnefSXwGwGNGKEmp6Q2bdGzekpp3Q==
- dependencies:
- "@sentry-internal/tracing" "7.101.1"
- "@sentry/core" "7.101.1"
- "@sentry/types" "7.101.1"
- "@sentry/utils" "7.101.1"
-
-"@sentry/types@7.101.1":
- version "7.101.1"
- resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.101.1.tgz#7f936022d9b373f85ebf357634bf03a9e433a3d0"
- integrity sha512-bwtkQvrCZ6JGc7vqX7TEAKBgkbQFORt84FFS3JQQb8G3efTt9fZd2ReY4buteKQdlALl8h1QWVngTLmI+kyUuw==
-
-"@sentry/utils@7.101.1":
- version "7.101.1"
- resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.101.1.tgz#97399b1e6a63a15e8f9fec5112ac4834239f1db6"
- integrity sha512-Nrg0nrEI3nrOCd9SLJ/WGzxS5KMQE4cryLOvrDcHJRWpsSyGBF1hLLerk84Nsw/0myMsn7zTYU+xoq7idNsX5A==
- dependencies:
- "@sentry/types" "7.101.1"
+"@sentry-internal/feedback@7.102.0":
+ version "7.102.0"
+ resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-7.102.0.tgz#c3c7f5cfe9726b6d4d1917bd5bd01238154f8ee7"
+ integrity sha512-GxHdzbOF4tg6TtyQzFqb/8c/p07n68qZC5KYwzs7AuW5ey0IPmdC58pOh3Kk52JA0P69/RZy39+r1p1Swr6C+Q==
+ dependencies:
+ "@sentry/core" "7.102.0"
+ "@sentry/types" "7.102.0"
+ "@sentry/utils" "7.102.0"
+
+"@sentry-internal/replay-canvas@7.102.0":
+ version "7.102.0"
+ resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-7.102.0.tgz#2bed235bbcb22eea71c39650096d21a3ed32f466"
+ integrity sha512-rgNO4PdFv0AYflBsCNbSIwpQuOOJQTqyu8i8U0PupjveNjkm0CUJhber/ZOcaGmbyjdvwikGwgWY2O0Oj0USCA==
+ dependencies:
+ "@sentry/core" "7.102.0"
+ "@sentry/replay" "7.102.0"
+ "@sentry/types" "7.102.0"
+ "@sentry/utils" "7.102.0"
+
+"@sentry-internal/tracing@7.102.0":
+ version "7.102.0"
+ resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.102.0.tgz#24cf662e1eb5623f6d5197e78c66d7b257560eb8"
+ integrity sha512-BlE33HWL1IzkGa0W+pwTiyu01MUIfYf+WnO9UC8qkDW3jxVvg2zhoSjXSxikT+KPCOgoZpQHspaTzwjnI1LCvw==
+ dependencies:
+ "@sentry/core" "7.102.0"
+ "@sentry/types" "7.102.0"
+ "@sentry/utils" "7.102.0"
+
+"@sentry/browser@^7.102.0":
+ version "7.102.0"
+ resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.102.0.tgz#335f51d01aabf8c4d2abc871855f9c2d19f8f70d"
+ integrity sha512-hIggcMnojIbWhbmlRfkykHmy6n7pjug0AHfF19HRUQxAx9KJfMH5YdWvohov0Hb9fS+jdvqgE+/4AWbEeXQrHw==
+ dependencies:
+ "@sentry-internal/feedback" "7.102.0"
+ "@sentry-internal/replay-canvas" "7.102.0"
+ "@sentry-internal/tracing" "7.102.0"
+ "@sentry/core" "7.102.0"
+ "@sentry/replay" "7.102.0"
+ "@sentry/types" "7.102.0"
+ "@sentry/utils" "7.102.0"
+
+"@sentry/core@7.102.0":
+ version "7.102.0"
+ resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.102.0.tgz#da5e04a5fe97ed91464944dac40b813e6f8aa453"
+ integrity sha512-GO9eLOSBK1waW4AD0wDXAreaNqXFQ1MPQZrkKcN+GJYEFhJK1+u+MSV7vO5Fs/rIfaTZIZ2jtEkxSSAOucE8EQ==
+ dependencies:
+ "@sentry/types" "7.102.0"
+ "@sentry/utils" "7.102.0"
+
+"@sentry/replay@7.102.0":
+ version "7.102.0"
+ resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.102.0.tgz#209b7adb68e89772824218ecab498d3a6fbc2c42"
+ integrity sha512-sUIBN4ZY0J5/dQS3KOe5VLykm856KZkTrhV8kmBEylzQhw1BBc8i2ehTILy5ZYh9Ra8uXPTAmtwpvYf/dRDfAg==
+ dependencies:
+ "@sentry-internal/tracing" "7.102.0"
+ "@sentry/core" "7.102.0"
+ "@sentry/types" "7.102.0"
+ "@sentry/utils" "7.102.0"
+
+"@sentry/types@7.102.0":
+ version "7.102.0"
+ resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.102.0.tgz#b31e9faa54036053ab82c09c3c855035a4889c59"
+ integrity sha512-FPfFBP0x3LkPARw1/6cWySLq1djIo8ao3Qo2KNBeE9CHdq8bsS1a8zzjJLuWG4Ww+wieLP8/lY3WTgrCz4jowg==
+
+"@sentry/utils@7.102.0":
+ version "7.102.0"
+ resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.102.0.tgz#66325f2567986cc3fd12fbdb980fb8ada170342b"
+ integrity sha512-cp5KCRe0slOVMwG4iP2Z4UajQkjryRTiFskZ5H7Q3X9R5voM8+DAhiDcIW88GL9NxqyUrAJOjmKdeLK2vM+bdA==
+ dependencies:
+ "@sentry/types" "7.102.0"
"@sindresorhus/merge-streams@^1.0.0":
version "1.0.0"
From d5b2336bbb1b029033cde487005320392cd762d6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Feb 2024 23:59:13 +0000
Subject: [PATCH 27/53] Bump turbo-rails from 2.0.3 to 2.0.4 (#2234)
---
Gemfile.lock | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index 795ca89d6..ef764dcda 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -315,7 +315,7 @@ GEM
pundit (2.3.1)
activesupport (>= 3.0.0)
racc (1.7.3)
- rack (2.2.8)
+ rack (2.2.8.1)
rack-session (1.0.2)
rack (< 3)
rack-test (2.1.0)
@@ -504,7 +504,7 @@ GEM
activerecord (>= 5.2)
thor (1.3.0)
timeout (0.4.1)
- turbo-rails (2.0.3)
+ turbo-rails (2.0.4)
actionpack (>= 6.0.0)
activejob (>= 6.0.0)
railties (>= 6.0.0)
From bdfac8d475516de21df20cd019f74dfa21b52bb9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Feb 2024 23:59:41 +0000
Subject: [PATCH 28/53] Bump pagy from 7.0.3 to 7.0.4 (#2236)
---
Gemfile.lock | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index ef764dcda..f3ba7b53f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -295,7 +295,7 @@ GEM
nokogiri (1.16.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
- pagy (7.0.3)
+ pagy (7.0.4)
parallel (1.24.0)
parser (3.3.0.5)
ast (~> 2.4.1)
From b2832f397f1cb8de45b4299b139864e773f08c06 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Feb 2024 00:00:03 +0000
Subject: [PATCH 29/53] Bump square.rb from 35.0.1.20240118 to 36.0.0.20240222
(#2237)
---
Gemfile.lock | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index f3ba7b53f..b29a45fd3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -90,11 +90,10 @@ GEM
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
- apimatic_core (0.3.4)
+ apimatic_core (0.3.5)
apimatic_core_interfaces (~> 0.2.0)
certifi (~> 2018.1, >= 2018.01.18)
faraday-multipart (~> 1.0)
- json-pointer
nokogiri (~> 1.10, >= 1.10.10)
apimatic_core_interfaces (0.2.0)
apimatic_faraday_client_adapter (0.1.4)
@@ -230,7 +229,6 @@ GEM
jsbundling-rails (1.3.0)
railties (>= 6.0.0)
json (2.7.1)
- json-pointer (0.0.1)
json-schema (4.1.1)
addressable (>= 2.8)
language_server-protocol (3.17.0.3)
@@ -276,7 +274,7 @@ GEM
money (~> 6.13)
railties (>= 3.0)
msgpack (1.7.2)
- multipart-post (2.3.0)
+ multipart-post (2.4.0)
mutex_m (0.2.0)
net-http (0.4.1)
uri
@@ -478,7 +476,7 @@ GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
- square.rb (35.0.1.20240118)
+ square.rb (36.0.0.20240222)
apimatic_core (~> 0.3.0)
apimatic_core_interfaces (~> 0.2.0)
apimatic_faraday_client_adapter (~> 0.1.0)
From f88803557d4dca3f630650fe4f5cbba9374e7da3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Feb 2024 00:44:04 +0000
Subject: [PATCH 30/53] Bump view_component from 3.10.0 to 3.11.0 (#2235)
---
Gemfile | 2 +-
Gemfile.lock | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Gemfile b/Gemfile
index c28c4d025..9a25d6ac8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -42,7 +42,7 @@ gem "redcarpet", "~> 3.6"
gem "gretel", "~> 5.0"
# Better UI components
gem "lookbook", ">= 2.0.0.beta.4"
-gem "view_component", "~> 3.10"
+gem "view_component", "~> 3.11"
# QR Code Generation!
gem "rqrcode", "~> 2.2"
diff --git a/Gemfile.lock b/Gemfile.lock
index b29a45fd3..d8f3acbf3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -510,7 +510,7 @@ GEM
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
uri (0.13.0)
- view_component (3.10.0)
+ view_component (3.11.0)
activesupport (>= 5.2.0, < 8.0)
concurrent-ruby (~> 1.0)
method_source (~> 1.0)
@@ -597,7 +597,7 @@ DEPENDENCIES
strong_migrations (~> 1.7)
turbo-rails
tzinfo-data (~> 1.2021)
- view_component (~> 3.10)
+ view_component (~> 3.11)
web-console (~> 4.2)
webmock
From f171b208bb512867aab1e5e93c03a1c232d8ec2f Mon Sep 17 00:00:00 2001
From: Zee <50284+zspencer@users.noreply.github.com>
Date: Wed, 21 Feb 2024 17:22:58 -0800
Subject: [PATCH 31/53] =?UTF-8?q?=F0=9F=90=9E=F0=9F=94=A8=20`Marketplace`:?=
=?UTF-8?q?=20Don't=20show=20`Product#servings`=20on=20`Menu`=20when=20`bl?=
=?UTF-8?q?ank=3F`=20(#2219)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- https://github.com/zinc-collective/convene/issues/2170
- https://github.com/zinc-collective/convene/issues/2153
---
.../product/title_component.html.erb | 4 +++-
.../menu/product_component_spec.rb | 19 +++++++++++++++++++
2 files changed, 22 insertions(+), 1 deletion(-)
create mode 100644 spec/furniture/marketplace/menu/product_component_spec.rb
diff --git a/app/furniture/marketplace/product/title_component.html.erb b/app/furniture/marketplace/product/title_component.html.erb
index 65136464f..9f21e96af 100644
--- a/app/furniture/marketplace/product/title_component.html.erb
+++ b/app/furniture/marketplace/product/title_component.html.erb
@@ -1,2 +1,4 @@
<%= name %>
-
Serves <%= servings %>
+<%- if servings.present? %>
+
Serves <%= servings %>
+<%- end %>
diff --git a/spec/furniture/marketplace/menu/product_component_spec.rb b/spec/furniture/marketplace/menu/product_component_spec.rb
new file mode 100644
index 000000000..ba88ffa4f
--- /dev/null
+++ b/spec/furniture/marketplace/menu/product_component_spec.rb
@@ -0,0 +1,19 @@
+require "rails_helper"
+
+RSpec.describe Marketplace::Menu::ProductComponent, type: :component do
+ subject(:output) { render_inline(component) }
+
+ let(:component) { described_class.new(product:, cart:) }
+ let(:marketplace) { create(:marketplace) }
+ let(:cart) { create(:marketplace_cart, marketplace:) }
+ let(:product) { create(:marketplace_product, marketplace:) }
+
+ it { is_expected.to have_content(vc_test_controller.view_context.humanized_money_with_symbol(product.price)) }
+ it { is_expected.to have_no_content("Serves") }
+
+ context "when the product has servings" do
+ let(:product) { create(:marketplace_product, marketplace:, servings: 2) }
+
+ it { is_expected.to have_content("Serves 2") }
+ end
+end
From 02d036a16f0e82b6be812a5e9f004904f9753af6 Mon Sep 17 00:00:00 2001
From: Zee <50284+zspencer@users.noreply.github.com>
Date: Wed, 21 Feb 2024 17:23:34 -0800
Subject: [PATCH 32/53] =?UTF-8?q?=F0=9F=8C=B8=20`Journal`:=20Remove=20ital?=
=?UTF-8?q?ics=20from=20`Keyword`=20(#2222)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- https://github.com/zinc-collective/journal/issues/5
Another de-italicization.
---
app/furniture/journal/keywords/show.html.erb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/furniture/journal/keywords/show.html.erb b/app/furniture/journal/keywords/show.html.erb
index cd431c7c6..0c2c481bc 100644
--- a/app/furniture/journal/keywords/show.html.erb
+++ b/app/furniture/journal/keywords/show.html.erb
@@ -1,9 +1,9 @@
<%= keyword.canonical_keyword %>
<%- if keyword.aliases.present? %>
-
Also known as <%= to_sentence(keyword.aliases) %>
+
Also known as <%= to_sentence(keyword.aliases) %>
<%- end %>
-
Entries about <%= keyword.canonical_keyword %>
+
Entries about <%= keyword.canonical_keyword %>
<%= render Journal::NewEntryButtonComponent.new(keyword: keyword) %>
<%- policy_scope(keyword.entries).each do |entry|%>
From 0c6e17048ca8eea6cf254e0c2afb50e71368b852 Mon Sep 17 00:00:00 2001
From: Zee <50284+zspencer@users.noreply.github.com>
Date: Wed, 21 Feb 2024 17:53:59 -0800
Subject: [PATCH 33/53] =?UTF-8?q?=F0=9F=8C=B8=E2=9C=A8=F0=9F=A5=A1=20`Mark?=
=?UTF-8?q?etplace`:=20`Products#description`=20is=20Rich=20Text=20(#2200)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- https://github.com/zinc-collective/convene/issues/2197
- https://github.com/zinc-collective/convene/issues/2153
---
app/assets/stylesheets/application.postcss.css | 1 +
.../marketplace/cart_product_component.html.erb | 4 +---
.../marketplace/menu_component.html.erb | 2 +-
app/furniture/marketplace/product.rb | 4 +++-
.../marketplace/products/_form.html.erb | 2 +-
app/furniture/marketplace/products_controller.rb | 2 +-
app/views/application/_rich_text_area.html.erb | 8 ++++++++
lib/tasks/release.rake | 3 +++
.../marketplace/cart_product_component_spec.rb | 3 +--
.../marketplace/menu/product_component_spec.rb | 16 ++++++++++++++--
.../marketplace/product_component_spec.rb | 15 ++++++++++++++-
.../products_controller_request_spec.rb | 2 +-
.../marketplace/selling_products_system_spec.rb | 4 +++-
13 files changed, 52 insertions(+), 14 deletions(-)
create mode 100644 app/views/application/_rich_text_area.html.erb
diff --git a/app/assets/stylesheets/application.postcss.css b/app/assets/stylesheets/application.postcss.css
index dc8bd8752..5bb120d4d 100644
--- a/app/assets/stylesheets/application.postcss.css
+++ b/app/assets/stylesheets/application.postcss.css
@@ -1,4 +1,5 @@
/* Entry point for your PostCSS build */
+@import "trix";
@import "./tailwind.scss";
diff --git a/app/furniture/marketplace/cart_product_component.html.erb b/app/furniture/marketplace/cart_product_component.html.erb
index a0cae15e0..1c970cd3f 100644
--- a/app/furniture/marketplace/cart_product_component.html.erb
+++ b/app/furniture/marketplace/cart_product_component.html.erb
@@ -11,9 +11,7 @@
-
- <%= product.description %>
-
+
<%= humanized_money_with_symbol(product.price) %>
diff --git a/app/furniture/marketplace/menu_component.html.erb b/app/furniture/marketplace/menu_component.html.erb
index 0973effae..d0f95d85a 100644
--- a/app/furniture/marketplace/menu_component.html.erb
+++ b/app/furniture/marketplace/menu_component.html.erb
@@ -1,5 +1,5 @@
- <%- marketplace.products.unarchived.each do |product| %>
+ <%- marketplace.products.with_all_rich_text.unarchived.each do |product| %>
<%= render Marketplace::Menu::ProductComponent.new(product:, cart:)%>
<%- end %>
diff --git a/app/furniture/marketplace/product.rb b/app/furniture/marketplace/product.rb
index 03b4c81a8..50253fe0d 100644
--- a/app/furniture/marketplace/product.rb
+++ b/app/furniture/marketplace/product.rb
@@ -2,6 +2,8 @@
class Marketplace
class Product < Record
+ self.ignored_columns += ["description"]
+
include Archivable
# TODO: Refactor to use Media model
@@ -32,7 +34,7 @@ class Product < Record
attribute :name, :string
validates :name, presence: true
- attribute :description, :string
+ has_rich_text :description
monetize :price_cents
diff --git a/app/furniture/marketplace/products/_form.html.erb b/app/furniture/marketplace/products/_form.html.erb
index 3604b0fb8..c4e3f705b 100644
--- a/app/furniture/marketplace/products/_form.html.erb
+++ b/app/furniture/marketplace/products/_form.html.erb
@@ -1,7 +1,7 @@
<%= render CardComponent.new(dom_id: dom_id(product), classes: "mt-3") do %>
<%= form_with model: product.location do |f| %>
<%= render "text_field", { attribute: :name, form: f} %>
- <%= render "text_area", { attribute: :description, form: f} %>
+ <%= render "rich_text_area", { attribute: :description, form: f} %>
<%= render "number_field", { attribute: :servings, form: f, min: 0, step: 1} %>
<%= render "money_field", { attribute: :price, form: f, min: 0, step: 0.01} %>
diff --git a/app/furniture/marketplace/products_controller.rb b/app/furniture/marketplace/products_controller.rb
index 23f60846c..10c9a7cc5 100644
--- a/app/furniture/marketplace/products_controller.rb
+++ b/app/furniture/marketplace/products_controller.rb
@@ -3,7 +3,7 @@
class Marketplace
class ProductsController < Controller
expose :product, scope: -> { products }, model: Product
- expose :products, -> { policy_scope(marketplace.products) }
+ expose :products, -> { policy_scope(marketplace.products.with_all_rich_text) }
def new
authorize(product)
diff --git a/app/views/application/_rich_text_area.html.erb b/app/views/application/_rich_text_area.html.erb
new file mode 100644
index 000000000..dd8383172
--- /dev/null
+++ b/app/views/application/_rich_text_area.html.erb
@@ -0,0 +1,8 @@
+
+ <%= form.label attribute %>
+ <% if local_assigns[:label_hint] %>
+ <%= local_assigns[:label_hint] %>
+ <% end %>
+ <%= form.rich_text_area attribute, class: local_assigns[:field_classes] %>
+ <%= render partial: "error", locals: { model: form.object, attribute: attribute } %>
+
diff --git a/lib/tasks/release.rake b/lib/tasks/release.rake
index 1d4aa5244..e2429954f 100644
--- a/lib/tasks/release.rake
+++ b/lib/tasks/release.rake
@@ -4,5 +4,8 @@ namespace :release do
desc "Ensures any post-release / pre-deploy behavior has occurred"
task after_build: [:environment, "db:prepare"] do
# Put code you want to execute after migrations but before release here
+ Marketplace::Product.connection.execute("SELECT id, description FROM marketplace_products").each do |result|
+ Marketplace::Product.find(result["id"]).update(description: result["description"])
+ end
end
end
diff --git a/spec/furniture/marketplace/cart_product_component_spec.rb b/spec/furniture/marketplace/cart_product_component_spec.rb
index d80fe778a..3407763c9 100644
--- a/spec/furniture/marketplace/cart_product_component_spec.rb
+++ b/spec/furniture/marketplace/cart_product_component_spec.rb
@@ -7,13 +7,12 @@
let(:cart) { create(:marketplace_cart) }
let(:marketplace) { cart.marketplace }
- let(:product) { create(:marketplace_product, :with_description, :with_photo) }
+ let(:product) { create(:marketplace_product, :with_photo, description: "Hello There") }
let(:cart_product) { create(:marketplace_cart_product, cart:, product:, quantity: 5) }
let(:component) { described_class.new(cart_product: cart_product, current_person: operator) }
it { is_expected.to have_content(product.name) }
- it { is_expected.to have_content(product.description) }
it { is_expected.to have_content(helpers.humanized_money_with_symbol(product.price)) }
it { is_expected.to have_button("➕") }
it { is_expected.to have_button("➖") }
diff --git a/spec/furniture/marketplace/menu/product_component_spec.rb b/spec/furniture/marketplace/menu/product_component_spec.rb
index ba88ffa4f..5314445d1 100644
--- a/spec/furniture/marketplace/menu/product_component_spec.rb
+++ b/spec/furniture/marketplace/menu/product_component_spec.rb
@@ -5,12 +5,24 @@
let(:component) { described_class.new(product:, cart:) }
let(:marketplace) { create(:marketplace) }
- let(:cart) { create(:marketplace_cart, marketplace:) }
- let(:product) { create(:marketplace_product, marketplace:) }
+ let(:cart) { marketplace.cart_for_shopper(shopper: create(:marketplace_shopper)) }
+ let(:product) { create(:marketplace_product, description: product_description, marketplace:) }
+ let(:product_description) do
+ <<~DESC.chomp
+ A delicious fritter made with love
+
+ Make sure to eat it warm!
+ DESC
+ end
it { is_expected.to have_content(vc_test_controller.view_context.humanized_money_with_symbol(product.price)) }
it { is_expected.to have_no_content("Serves") }
+ it "renders the description as rich text" do
+ expect(output).to have_css("p", text: "A delicious fritter made with love")
+ expect(output).to have_css("strong", text: "eat it warm!")
+ end
+
context "when the product has servings" do
let(:product) { create(:marketplace_product, marketplace:, servings: 2) }
diff --git a/spec/furniture/marketplace/product_component_spec.rb b/spec/furniture/marketplace/product_component_spec.rb
index 01d52e7e1..7cfd1b28e 100644
--- a/spec/furniture/marketplace/product_component_spec.rb
+++ b/spec/furniture/marketplace/product_component_spec.rb
@@ -7,7 +7,14 @@
let(:component) { described_class.new(product: product, current_person: operator) }
let(:marketplace) { create(:marketplace) }
- let(:product) { create(:marketplace_product, tax_rates: [tax_rate], marketplace: marketplace) }
+ let(:product_description) do
+ <<~DESC.chomp
+ A delicious fritter made with love
+
+ Make sure to eat it warm!
+ DESC
+ end
+ let(:product) { create(:marketplace_product, description: product_description, tax_rates: [tax_rate], marketplace: marketplace) }
let(:tax_rate) { create(:marketplace_tax_rate, marketplace: marketplace) }
it { is_expected.to have_content(tax_rate.label) }
@@ -15,6 +22,12 @@
it { is_expected.to have_content(vc_test_controller.view_context.humanized_money_with_symbol(product.price)) }
it { is_expected.to have_css("a[href='#{polymorphic_path(product.location(:edit))}'][data-turbo=true][data-turbo-method=get]") }
+
+ it "renders the description as rich text" do
+ expect(output).to have_css("p", text: "A delicious fritter made with love")
+ expect(output).to have_css("strong", text: "eat it warm!")
+ end
+
it { is_expected.to have_no_link(I18n.t("destroy.link_to")) }
it { is_expected.to have_link(I18n.t("archive.link_to")) }
diff --git a/spec/furniture/marketplace/products_controller_request_spec.rb b/spec/furniture/marketplace/products_controller_request_spec.rb
index 883e4482f..54cc518c6 100644
--- a/spec/furniture/marketplace/products_controller_request_spec.rb
+++ b/spec/furniture/marketplace/products_controller_request_spec.rb
@@ -28,7 +28,7 @@
before { perform_request }
specify { expect(created_product.name).to eql(product_attributes[:name]) }
- specify { expect(created_product.description).to eql(product_attributes[:description]) }
+ specify { expect(created_product.description.body).to eql(product_attributes[:description]) }
specify { expect(created_product.price_cents).to eql(product_attributes[:price_cents]) }
specify { expect(created_product.price_currency).to eql(Money.default_currency.to_s) }
specify { expect(created_product.tax_rates).to include(tax_rate) }
diff --git a/spec/furniture/marketplace/selling_products_system_spec.rb b/spec/furniture/marketplace/selling_products_system_spec.rb
index f56c35ec0..cf8b7eb6f 100644
--- a/spec/furniture/marketplace/selling_products_system_spec.rb
+++ b/spec/furniture/marketplace/selling_products_system_spec.rb
@@ -2,6 +2,8 @@
# @see https://github.com/zinc-collective/convene/issues/1326
describe "Marketplace: Selling Products", type: :system do
+ include ActionText::SystemTestHelper
+
let(:space) { create(:space, :with_entrance, :with_members) }
let(:marketplace) { create(:marketplace, room: space.entrance) }
let(:product) { create(:marketplace_product, marketplace:) }
@@ -25,7 +27,7 @@
Made with a Trunk.
DESC
- fill_in("Description", with: description)
+ fill_in_rich_text_area("Description", with: description)
fill_in("Price", with: "10.00")
fill_in("Servings", with: 4)
From 9bcc94774a9d0d7ffa3e41b3fd0d8f57293aa5b7 Mon Sep 17 00:00:00 2001
From: Zee <50284+zspencer@users.noreply.github.com>
Date: Wed, 21 Feb 2024 18:01:43 -0800
Subject: [PATCH 34/53] =?UTF-8?q?=F0=9F=A7=B9=20`Marketplace`:=20Remove=20?=
=?UTF-8?q?`Product#description`=20column=20(#2238)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- https://github.com/zinc-collective/convene/issues/2197
`ActionText` stores it's data in it's own table; so we don't need it.
---
app/furniture/marketplace/product.rb | 2 --
...240222004148_remove_marketplace_products_description.rb | 7 +++++++
db/schema.rb | 3 +--
lib/tasks/release.rake | 3 ---
4 files changed, 8 insertions(+), 7 deletions(-)
create mode 100644 db/migrate/20240222004148_remove_marketplace_products_description.rb
diff --git a/app/furniture/marketplace/product.rb b/app/furniture/marketplace/product.rb
index 50253fe0d..93e2dd6d2 100644
--- a/app/furniture/marketplace/product.rb
+++ b/app/furniture/marketplace/product.rb
@@ -2,8 +2,6 @@
class Marketplace
class Product < Record
- self.ignored_columns += ["description"]
-
include Archivable
# TODO: Refactor to use Media model
diff --git a/db/migrate/20240222004148_remove_marketplace_products_description.rb b/db/migrate/20240222004148_remove_marketplace_products_description.rb
new file mode 100644
index 000000000..9d8763258
--- /dev/null
+++ b/db/migrate/20240222004148_remove_marketplace_products_description.rb
@@ -0,0 +1,7 @@
+class RemoveMarketplaceProductsDescription < ActiveRecord::Migration[7.1]
+ def change
+ safety_assured do
+ remove_column :marketplace_products, :description, :string
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b9c08f79b..378aa23c1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.1].define(version: 2024_02_16_213129) do
+ActiveRecord::Schema[7.1].define(version: 2024_02_22_004148) do
# These are extensions that must be enabled in order to support this database
enable_extension "pgcrypto"
enable_extension "plpgsql"
@@ -214,7 +214,6 @@
create_table "marketplace_products", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
t.uuid "marketplace_id"
t.string "name"
- t.string "description"
t.integer "price_cents", default: 0, null: false
t.string "price_currency", default: "USD", null: false
t.datetime "created_at", null: false
diff --git a/lib/tasks/release.rake b/lib/tasks/release.rake
index e2429954f..1d4aa5244 100644
--- a/lib/tasks/release.rake
+++ b/lib/tasks/release.rake
@@ -4,8 +4,5 @@ namespace :release do
desc "Ensures any post-release / pre-deploy behavior has occurred"
task after_build: [:environment, "db:prepare"] do
# Put code you want to execute after migrations but before release here
- Marketplace::Product.connection.execute("SELECT id, description FROM marketplace_products").each do |result|
- Marketplace::Product.find(result["id"]).update(description: result["description"])
- end
end
end
From bbc9508f9a573672a85493d6259854b42ad66bc9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Feb 2024 03:05:32 +0000
Subject: [PATCH 35/53] Bump cssbundling-rails from 1.1.2 to 1.4.0 (#2139)
---
.gitignore | 2 +-
Gemfile.lock | 2 +-
app/assets/builds/.keep | 0
3 files changed, 2 insertions(+), 2 deletions(-)
create mode 100644 app/assets/builds/.keep
diff --git a/.gitignore b/.gitignore
index a873e526f..753b67f2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,7 @@ features/test_reports/*.png
coverage/
-app/assets/builds/
+app/assets/builds/*
!/app/assets/builds/.keep
/node_modules
diff --git a/Gemfile.lock b/Gemfile.lock
index d8f3acbf3..cfd34871a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -158,7 +158,7 @@ GEM
crass (1.0.6)
css_parser (1.16.0)
addressable
- cssbundling-rails (1.1.2)
+ cssbundling-rails (1.4.0)
railties (>= 6.0.0)
date (3.3.3)
debug_inspector (1.1.0)
diff --git a/app/assets/builds/.keep b/app/assets/builds/.keep
new file mode 100644
index 000000000..e69de29bb
From 62f9986d60287bea8db2d3dbb0e4a23580a8769d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 24 Feb 2024 05:21:59 +0000
Subject: [PATCH 36/53] Bump pagy from 7.0.4 to 7.0.5 (#2242)
---
Gemfile.lock | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index cfd34871a..da0c4c1e3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -293,7 +293,7 @@ GEM
nokogiri (1.16.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
- pagy (7.0.4)
+ pagy (7.0.5)
parallel (1.24.0)
parser (3.3.0.5)
ast (~> 2.4.1)
From 6162afd228706e1340232516fd790b7ef43fe22b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 24 Feb 2024 05:22:12 +0000
Subject: [PATCH 37/53] Bump webmock from 3.21.0 to 3.22.0 (#2241)
---
Gemfile.lock | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index da0c4c1e3..10458b96a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -519,7 +519,7 @@ GEM
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
railties (>= 6.0.0)
- webmock (3.21.0)
+ webmock (3.22.0)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
From e617e2c865ab32a2e7752fdeff01b9d1fa9e1ee2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 24 Feb 2024 05:22:25 +0000
Subject: [PATCH 38/53] Bump stripe from 10.9.0 to 10.10.0 (#2240)
---
Gemfile.lock | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index 10458b96a..57d5f0008 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -497,7 +497,7 @@ GEM
stringio (3.1.0)
strip_attributes (1.13.0)
activemodel (>= 3.0, < 8.0)
- stripe (10.9.0)
+ stripe (10.10.0)
strong_migrations (1.7.0)
activerecord (>= 5.2)
thor (1.3.0)
From fdd0f90cf5ec5158f6f45b665be2cf63079275e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 24 Feb 2024 05:22:37 +0000
Subject: [PATCH 39/53] Bump @sentry/browser from 7.102.0 to 7.102.1 (#2239)
---
package.json | 2 +-
yarn.lock | 140 +++++++++++++++++++++++++--------------------------
2 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/package.json b/package.json
index 0aa3d982b..b66ce8fe1 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
"@rails/actioncable": "^7.1.3",
"@rails/actiontext": "^7.1.3",
"@rails/activestorage": "^7.1.3",
- "@sentry/browser": "^7.102.0",
+ "@sentry/browser": "^7.102.1",
"@tailwindcss/forms": "^0.5.7",
"@tailwindcss/typography": "^0.5.10",
"@webpack-cli/serve": "^2.0.5",
diff --git a/yarn.lock b/yarn.lock
index 312993241..5d7c3e6ca 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -413,76 +413,76 @@
dependencies:
spark-md5 "^3.0.1"
-"@sentry-internal/feedback@7.102.0":
- version "7.102.0"
- resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-7.102.0.tgz#c3c7f5cfe9726b6d4d1917bd5bd01238154f8ee7"
- integrity sha512-GxHdzbOF4tg6TtyQzFqb/8c/p07n68qZC5KYwzs7AuW5ey0IPmdC58pOh3Kk52JA0P69/RZy39+r1p1Swr6C+Q==
- dependencies:
- "@sentry/core" "7.102.0"
- "@sentry/types" "7.102.0"
- "@sentry/utils" "7.102.0"
-
-"@sentry-internal/replay-canvas@7.102.0":
- version "7.102.0"
- resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-7.102.0.tgz#2bed235bbcb22eea71c39650096d21a3ed32f466"
- integrity sha512-rgNO4PdFv0AYflBsCNbSIwpQuOOJQTqyu8i8U0PupjveNjkm0CUJhber/ZOcaGmbyjdvwikGwgWY2O0Oj0USCA==
- dependencies:
- "@sentry/core" "7.102.0"
- "@sentry/replay" "7.102.0"
- "@sentry/types" "7.102.0"
- "@sentry/utils" "7.102.0"
-
-"@sentry-internal/tracing@7.102.0":
- version "7.102.0"
- resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.102.0.tgz#24cf662e1eb5623f6d5197e78c66d7b257560eb8"
- integrity sha512-BlE33HWL1IzkGa0W+pwTiyu01MUIfYf+WnO9UC8qkDW3jxVvg2zhoSjXSxikT+KPCOgoZpQHspaTzwjnI1LCvw==
- dependencies:
- "@sentry/core" "7.102.0"
- "@sentry/types" "7.102.0"
- "@sentry/utils" "7.102.0"
-
-"@sentry/browser@^7.102.0":
- version "7.102.0"
- resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.102.0.tgz#335f51d01aabf8c4d2abc871855f9c2d19f8f70d"
- integrity sha512-hIggcMnojIbWhbmlRfkykHmy6n7pjug0AHfF19HRUQxAx9KJfMH5YdWvohov0Hb9fS+jdvqgE+/4AWbEeXQrHw==
- dependencies:
- "@sentry-internal/feedback" "7.102.0"
- "@sentry-internal/replay-canvas" "7.102.0"
- "@sentry-internal/tracing" "7.102.0"
- "@sentry/core" "7.102.0"
- "@sentry/replay" "7.102.0"
- "@sentry/types" "7.102.0"
- "@sentry/utils" "7.102.0"
-
-"@sentry/core@7.102.0":
- version "7.102.0"
- resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.102.0.tgz#da5e04a5fe97ed91464944dac40b813e6f8aa453"
- integrity sha512-GO9eLOSBK1waW4AD0wDXAreaNqXFQ1MPQZrkKcN+GJYEFhJK1+u+MSV7vO5Fs/rIfaTZIZ2jtEkxSSAOucE8EQ==
- dependencies:
- "@sentry/types" "7.102.0"
- "@sentry/utils" "7.102.0"
-
-"@sentry/replay@7.102.0":
- version "7.102.0"
- resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.102.0.tgz#209b7adb68e89772824218ecab498d3a6fbc2c42"
- integrity sha512-sUIBN4ZY0J5/dQS3KOe5VLykm856KZkTrhV8kmBEylzQhw1BBc8i2ehTILy5ZYh9Ra8uXPTAmtwpvYf/dRDfAg==
- dependencies:
- "@sentry-internal/tracing" "7.102.0"
- "@sentry/core" "7.102.0"
- "@sentry/types" "7.102.0"
- "@sentry/utils" "7.102.0"
-
-"@sentry/types@7.102.0":
- version "7.102.0"
- resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.102.0.tgz#b31e9faa54036053ab82c09c3c855035a4889c59"
- integrity sha512-FPfFBP0x3LkPARw1/6cWySLq1djIo8ao3Qo2KNBeE9CHdq8bsS1a8zzjJLuWG4Ww+wieLP8/lY3WTgrCz4jowg==
-
-"@sentry/utils@7.102.0":
- version "7.102.0"
- resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.102.0.tgz#66325f2567986cc3fd12fbdb980fb8ada170342b"
- integrity sha512-cp5KCRe0slOVMwG4iP2Z4UajQkjryRTiFskZ5H7Q3X9R5voM8+DAhiDcIW88GL9NxqyUrAJOjmKdeLK2vM+bdA==
- dependencies:
- "@sentry/types" "7.102.0"
+"@sentry-internal/feedback@7.102.1":
+ version "7.102.1"
+ resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-7.102.1.tgz#747f88c2881c76fddd16bce57cc4bc17b4c2af93"
+ integrity sha512-vY4hpLLMNLjICtWiizc7KeGbWOTUMGrF7C+9dPCztZww3CLgzWy9A7DvPj5hodRiYzpdRnAMl8yQnMFbYXh7bA==
+ dependencies:
+ "@sentry/core" "7.102.1"
+ "@sentry/types" "7.102.1"
+ "@sentry/utils" "7.102.1"
+
+"@sentry-internal/replay-canvas@7.102.1":
+ version "7.102.1"
+ resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-7.102.1.tgz#f098814ce21fdf95ef6d440d7ff8a6d3bfe73054"
+ integrity sha512-GUX4RWI10uRjdjeyvCLtAAhWRVqnAnG6+yNxWfqUQ3qMA7B7XxG43KT2UhSnulmErNzODQ6hA68rGPwwYeRIww==
+ dependencies:
+ "@sentry/core" "7.102.1"
+ "@sentry/replay" "7.102.1"
+ "@sentry/types" "7.102.1"
+ "@sentry/utils" "7.102.1"
+
+"@sentry-internal/tracing@7.102.1":
+ version "7.102.1"
+ resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.102.1.tgz#5c39c8f04a4a1a665fb6d368e1cd13605152f18b"
+ integrity sha512-RkFlFyAC0fQOvBbBqnq0CLmFW5m3JJz9pKbZd5vXPraWAlniKSb1bC/4DF9SlNx0FN1LWG+IU3ISdpzwwTeAGg==
+ dependencies:
+ "@sentry/core" "7.102.1"
+ "@sentry/types" "7.102.1"
+ "@sentry/utils" "7.102.1"
+
+"@sentry/browser@^7.102.1":
+ version "7.102.1"
+ resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.102.1.tgz#30d3da587b2b6542b3d9e39d923ed28a2704d454"
+ integrity sha512-7BOfPBiM7Kp6q/iy0JIbsBTxIASV+zWXByqqjuEMWGj3X2u4oRIfm3gv4erPU/l+CORQUVQZLSPGoIoM1gbB/A==
+ dependencies:
+ "@sentry-internal/feedback" "7.102.1"
+ "@sentry-internal/replay-canvas" "7.102.1"
+ "@sentry-internal/tracing" "7.102.1"
+ "@sentry/core" "7.102.1"
+ "@sentry/replay" "7.102.1"
+ "@sentry/types" "7.102.1"
+ "@sentry/utils" "7.102.1"
+
+"@sentry/core@7.102.1":
+ version "7.102.1"
+ resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.102.1.tgz#855d37b6bba9986a9380864c823e696d3fc5aa01"
+ integrity sha512-QjY+LSP3du3J/C8x/FfEbRxgZgsWd0jfTJ4P7s9f219I1csK4OeBMC3UA1HwEa0pY/9OF6H/egW2CjOcMM5Pdg==
+ dependencies:
+ "@sentry/types" "7.102.1"
+ "@sentry/utils" "7.102.1"
+
+"@sentry/replay@7.102.1":
+ version "7.102.1"
+ resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.102.1.tgz#d6c17332d14dc312b124bbbda8f35d6a982b893c"
+ integrity sha512-HR/j9dGIvbrId8fh8mQlODx7JrhRmawEd9e9P3laPtogWCg/5TI+XPb2VGSaXOX9VWtb/6Z2UjHsaGjgg6YcuA==
+ dependencies:
+ "@sentry-internal/tracing" "7.102.1"
+ "@sentry/core" "7.102.1"
+ "@sentry/types" "7.102.1"
+ "@sentry/utils" "7.102.1"
+
+"@sentry/types@7.102.1":
+ version "7.102.1"
+ resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.102.1.tgz#18c35f32ecbd12afb9860ca2de7bfff542d10b27"
+ integrity sha512-htKorf3t/D0XYtM7foTcmG+rM47rDP6XdbvCcX5gBCuCYlzpM1vqCt2rl3FLktZC6TaIpFRJw1TLfx6m+x5jdA==
+
+"@sentry/utils@7.102.1":
+ version "7.102.1"
+ resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.102.1.tgz#45ddcdf2e700d40160347bbdf4233aff3179d398"
+ integrity sha512-+8WcFjHVV/HROXSAwMuUzveElBFC43EiTG7SNEBNgOUeQzQVTmbUZXyTVgLrUmtoWqvnIxCacoLxtZo1o67kdg==
+ dependencies:
+ "@sentry/types" "7.102.1"
"@sindresorhus/merge-streams@^1.0.0":
version "1.0.0"
From 91cd494abbffba1eaf1ca36ee6488a28ab8fd1c9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Feb 2024 00:18:41 +0000
Subject: [PATCH 40/53] Bump listen from 3.8.0 to 3.9.0 (#2247)
---
Gemfile | 2 +-
Gemfile.lock | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Gemfile b/Gemfile
index 9a25d6ac8..e3399a2a9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -137,7 +137,7 @@ group :development do
gem "binding_of_caller"
# Outputs i18n lookup key debug logs
gem "i18n-debug"
- gem "listen", "~> 3.8"
+ gem "listen", "~> 3.9"
gem "rails-erd"
# Access an interactive console on exception pages or by calling 'console' anywhere in the code.
gem "web-console", "~> 4.2"
diff --git a/Gemfile.lock b/Gemfile.lock
index 57d5f0008..a5d0e4c2d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -233,7 +233,7 @@ GEM
addressable (>= 2.8)
language_server-protocol (3.17.0.3)
lint_roller (1.1.0)
- listen (3.8.0)
+ listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
lockbox (1.3.3)
@@ -558,7 +558,7 @@ DEPENDENCIES
image_processing
jbuilder (~> 2.11)
jsbundling-rails
- listen (~> 3.8)
+ listen (~> 3.9)
lockbox (= 1.3.3)
lookbook (>= 2.0.0.beta.4)
money-rails
From 4e872da0fc3128c1ddce172c5eae0e99f9430acb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Feb 2024 00:48:16 +0000
Subject: [PATCH 41/53] Bump pagy from 7.0.5 to 7.0.6 (#2245)
---
Gemfile.lock | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index a5d0e4c2d..0defd1848 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -293,7 +293,7 @@ GEM
nokogiri (1.16.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
- pagy (7.0.5)
+ pagy (7.0.6)
parallel (1.24.0)
parser (3.3.0.5)
ast (~> 2.4.1)
From af462973ebdf7f1948584fabdcfcfa0beff1de3f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Feb 2024 01:12:33 +0000
Subject: [PATCH 42/53] Bump webmock from 3.22.0 to 3.23.0 (#2246)
---
Gemfile.lock | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index 0defd1848..751fb553d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -519,7 +519,7 @@ GEM
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
railties (>= 6.0.0)
- webmock (3.22.0)
+ webmock (3.23.0)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
From ac8b3ea441dbac629dc08708e5923289f2d4b3f5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Feb 2024 18:32:10 +0000
Subject: [PATCH 43/53] Bump @sentry/browser from 7.102.1 to 7.103.0 (#2251)
---
package.json | 2 +-
yarn.lock | 140 +++++++++++++++++++++++++--------------------------
2 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/package.json b/package.json
index b66ce8fe1..852075301 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
"@rails/actioncable": "^7.1.3",
"@rails/actiontext": "^7.1.3",
"@rails/activestorage": "^7.1.3",
- "@sentry/browser": "^7.102.1",
+ "@sentry/browser": "^7.103.0",
"@tailwindcss/forms": "^0.5.7",
"@tailwindcss/typography": "^0.5.10",
"@webpack-cli/serve": "^2.0.5",
diff --git a/yarn.lock b/yarn.lock
index 5d7c3e6ca..dfa20d8c8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -413,76 +413,76 @@
dependencies:
spark-md5 "^3.0.1"
-"@sentry-internal/feedback@7.102.1":
- version "7.102.1"
- resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-7.102.1.tgz#747f88c2881c76fddd16bce57cc4bc17b4c2af93"
- integrity sha512-vY4hpLLMNLjICtWiizc7KeGbWOTUMGrF7C+9dPCztZww3CLgzWy9A7DvPj5hodRiYzpdRnAMl8yQnMFbYXh7bA==
- dependencies:
- "@sentry/core" "7.102.1"
- "@sentry/types" "7.102.1"
- "@sentry/utils" "7.102.1"
-
-"@sentry-internal/replay-canvas@7.102.1":
- version "7.102.1"
- resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-7.102.1.tgz#f098814ce21fdf95ef6d440d7ff8a6d3bfe73054"
- integrity sha512-GUX4RWI10uRjdjeyvCLtAAhWRVqnAnG6+yNxWfqUQ3qMA7B7XxG43KT2UhSnulmErNzODQ6hA68rGPwwYeRIww==
- dependencies:
- "@sentry/core" "7.102.1"
- "@sentry/replay" "7.102.1"
- "@sentry/types" "7.102.1"
- "@sentry/utils" "7.102.1"
-
-"@sentry-internal/tracing@7.102.1":
- version "7.102.1"
- resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.102.1.tgz#5c39c8f04a4a1a665fb6d368e1cd13605152f18b"
- integrity sha512-RkFlFyAC0fQOvBbBqnq0CLmFW5m3JJz9pKbZd5vXPraWAlniKSb1bC/4DF9SlNx0FN1LWG+IU3ISdpzwwTeAGg==
- dependencies:
- "@sentry/core" "7.102.1"
- "@sentry/types" "7.102.1"
- "@sentry/utils" "7.102.1"
-
-"@sentry/browser@^7.102.1":
- version "7.102.1"
- resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.102.1.tgz#30d3da587b2b6542b3d9e39d923ed28a2704d454"
- integrity sha512-7BOfPBiM7Kp6q/iy0JIbsBTxIASV+zWXByqqjuEMWGj3X2u4oRIfm3gv4erPU/l+CORQUVQZLSPGoIoM1gbB/A==
- dependencies:
- "@sentry-internal/feedback" "7.102.1"
- "@sentry-internal/replay-canvas" "7.102.1"
- "@sentry-internal/tracing" "7.102.1"
- "@sentry/core" "7.102.1"
- "@sentry/replay" "7.102.1"
- "@sentry/types" "7.102.1"
- "@sentry/utils" "7.102.1"
-
-"@sentry/core@7.102.1":
- version "7.102.1"
- resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.102.1.tgz#855d37b6bba9986a9380864c823e696d3fc5aa01"
- integrity sha512-QjY+LSP3du3J/C8x/FfEbRxgZgsWd0jfTJ4P7s9f219I1csK4OeBMC3UA1HwEa0pY/9OF6H/egW2CjOcMM5Pdg==
- dependencies:
- "@sentry/types" "7.102.1"
- "@sentry/utils" "7.102.1"
-
-"@sentry/replay@7.102.1":
- version "7.102.1"
- resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.102.1.tgz#d6c17332d14dc312b124bbbda8f35d6a982b893c"
- integrity sha512-HR/j9dGIvbrId8fh8mQlODx7JrhRmawEd9e9P3laPtogWCg/5TI+XPb2VGSaXOX9VWtb/6Z2UjHsaGjgg6YcuA==
- dependencies:
- "@sentry-internal/tracing" "7.102.1"
- "@sentry/core" "7.102.1"
- "@sentry/types" "7.102.1"
- "@sentry/utils" "7.102.1"
-
-"@sentry/types@7.102.1":
- version "7.102.1"
- resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.102.1.tgz#18c35f32ecbd12afb9860ca2de7bfff542d10b27"
- integrity sha512-htKorf3t/D0XYtM7foTcmG+rM47rDP6XdbvCcX5gBCuCYlzpM1vqCt2rl3FLktZC6TaIpFRJw1TLfx6m+x5jdA==
-
-"@sentry/utils@7.102.1":
- version "7.102.1"
- resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.102.1.tgz#45ddcdf2e700d40160347bbdf4233aff3179d398"
- integrity sha512-+8WcFjHVV/HROXSAwMuUzveElBFC43EiTG7SNEBNgOUeQzQVTmbUZXyTVgLrUmtoWqvnIxCacoLxtZo1o67kdg==
- dependencies:
- "@sentry/types" "7.102.1"
+"@sentry-internal/feedback@7.103.0":
+ version "7.103.0"
+ resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-7.103.0.tgz#0b382b8fc9fc583be1164ff80df07fbe87b565b3"
+ integrity sha512-2nYoCfP7FpiUR+xxO5y5BL2ajHrhM4fL7HSup6QKNn7gI7vLyllYOOuYFNHhSmsXCD0i00U8DBClGLcn+6DQqw==
+ dependencies:
+ "@sentry/core" "7.103.0"
+ "@sentry/types" "7.103.0"
+ "@sentry/utils" "7.103.0"
+
+"@sentry-internal/replay-canvas@7.103.0":
+ version "7.103.0"
+ resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-7.103.0.tgz#d601e56c04fd51b226f6c2933e28a8ce6955e3ba"
+ integrity sha512-EyDRMdlSqtwY8zGFhOWwl+nwwo98hlhJz+bpF5PQ6VmFpbplh6Wqfx2p+cPXQr40TGMMC4+vPFlSWTOMjcO9zQ==
+ dependencies:
+ "@sentry/core" "7.103.0"
+ "@sentry/replay" "7.103.0"
+ "@sentry/types" "7.103.0"
+ "@sentry/utils" "7.103.0"
+
+"@sentry-internal/tracing@7.103.0":
+ version "7.103.0"
+ resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.103.0.tgz#b18ef65f610099ee2fc74f91f9ccfdb0353580c4"
+ integrity sha512-sZ/Wao8HOvGaBs7WlOdflMpHGAFkOBWL6hBiirHaOy5d+IDm7n7et5U6zhvcfiyYBO4nY36gy1Tg5mw+aNO0Vw==
+ dependencies:
+ "@sentry/core" "7.103.0"
+ "@sentry/types" "7.103.0"
+ "@sentry/utils" "7.103.0"
+
+"@sentry/browser@^7.103.0":
+ version "7.103.0"
+ resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.103.0.tgz#b509394d238e67f6225339c242701710ea347508"
+ integrity sha512-lP3Oplnwo1lY8ltk8SWzQURbxnSfVhYA099mVs1T95sdwXS16Za6SX7Ld/9T506ZW/WyoU4VCq7eKtG2kPFhMQ==
+ dependencies:
+ "@sentry-internal/feedback" "7.103.0"
+ "@sentry-internal/replay-canvas" "7.103.0"
+ "@sentry-internal/tracing" "7.103.0"
+ "@sentry/core" "7.103.0"
+ "@sentry/replay" "7.103.0"
+ "@sentry/types" "7.103.0"
+ "@sentry/utils" "7.103.0"
+
+"@sentry/core@7.103.0":
+ version "7.103.0"
+ resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.103.0.tgz#8f626362c96f9aa4b4a52042c431d16372491dc1"
+ integrity sha512-LCI+PIDoF/RLqN41fNXum3ilmS6ukni6L7t38vSdibbe2G0804EbPLtOIpv2PkS8E6CFuRW5zOb+8OwEAAtZWw==
+ dependencies:
+ "@sentry/types" "7.103.0"
+ "@sentry/utils" "7.103.0"
+
+"@sentry/replay@7.103.0":
+ version "7.103.0"
+ resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.103.0.tgz#6b420f1a33784e76533bb72ea9743e8ad34c0b23"
+ integrity sha512-I37komyb+DruQG8lPPPOFxLLbOijNXeTxiWLsIn+KFZqRtKqxxQWdNnk56V4YSTpFzxnMEFMRCpXhncuTWu4LA==
+ dependencies:
+ "@sentry-internal/tracing" "7.103.0"
+ "@sentry/core" "7.103.0"
+ "@sentry/types" "7.103.0"
+ "@sentry/utils" "7.103.0"
+
+"@sentry/types@7.103.0":
+ version "7.103.0"
+ resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.103.0.tgz#f413f922216c97ec86bae39f9d527669d8afedbd"
+ integrity sha512-NCvKyx8d2AGBQKPARrJemZmZ16DiMo688OEikZg4BbvFNDUzK5Egm2BH0vfLDhbNkU19o3maJowrYo42m8r9Zw==
+
+"@sentry/utils@7.103.0":
+ version "7.103.0"
+ resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.103.0.tgz#803b76e2adfdcec0d4ab6369cc8990dde19b55f4"
+ integrity sha512-phkUJt3F0UOkVq+M4GfdAh2ewI3ASrNiJddx9aO7GnT0aDwwVBHZltnqt95qgAB8W+BipTSt1dAh8yUbbq1Ceg==
+ dependencies:
+ "@sentry/types" "7.103.0"
"@sindresorhus/merge-streams@^1.0.0":
version "1.0.0"
From 9f0209036b52a907068d112884bc7646d293b142 Mon Sep 17 00:00:00 2001
From: Ana Ulin
Date: Wed, 28 Feb 2024 10:51:12 -0800
Subject: [PATCH 44/53] =?UTF-8?q?=F0=9F=A7=B9=20Ensure=20that=20factory=20?=
=?UTF-8?q?for=20Journal::Keyword=20always=20uses=20a=20unique=20canonical?=
=?UTF-8?q?=20keyword=20(#2254)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Ensure that factory for Journal::Keyword always uses a unique canonical_keyword.
---
spec/factories/furniture/journal.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/spec/factories/furniture/journal.rb b/spec/factories/furniture/journal.rb
index cdea165b7..a27b879d4 100644
--- a/spec/factories/furniture/journal.rb
+++ b/spec/factories/furniture/journal.rb
@@ -28,7 +28,7 @@
end
factory :journal_keyword, class: "Journal::Keyword" do
- canonical_keyword { Faker::Fantasy::Tolkien.location }
+ sequence(:canonical_keyword) { |n| "#{Faker::Fantasy::Tolkien.location}-#{n}" }
journal
end
end
From 5339ade8a7a40aebedbf62336d8b92f98040b5c0 Mon Sep 17 00:00:00 2001
From: Ross Chapman
Date: Wed, 28 Feb 2024 10:58:48 -0800
Subject: [PATCH 45/53] Cleans up Order and Order history UI (#2249)
---
app/furniture/layouts/marketplace.html.erb | 39 ++++++++++---------
.../marketplace/orders/_order.html.erb | 11 ++----
.../marketplace/orders/index.html.erb | 2 +-
3 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/app/furniture/layouts/marketplace.html.erb b/app/furniture/layouts/marketplace.html.erb
index 13b146c01..8dadf9bec 100644
--- a/app/furniture/layouts/marketplace.html.erb
+++ b/app/furniture/layouts/marketplace.html.erb
@@ -1,22 +1,25 @@
<%- content_for :content do %>
- <%= turbo_frame_tag(marketplace, data: { turbo_action: :advance }) do %>
- <%- if policy(marketplace).edit? %>
- <%= render Marketplace::ManagementComponent.new(marketplace: marketplace) do %>
- <%= yield %>
+
+
+ <%= turbo_frame_tag(marketplace, data: { turbo_action: :advance }) do %>
+ <%- if policy(marketplace).edit? %>
+ <%= render Marketplace::ManagementComponent.new(marketplace: marketplace) do %>
+ <%= yield %>
+ <%- end %>
+ <%- else %>
+
+
+
+ <%= t('.header', space: marketplace.space.name, room: marketplace.room.name) %>
+
+
+
+ <%= yield %>
+
+
+ <%- end %>
<%- end %>
- <%- else %>
-
-
-
- <%= t('.header', space: marketplace.space.name, room: marketplace.room.name) %>
-
-
-
-
- <%= yield %>
-
-
<%- end %>
- <%- end %>
-<%- end %>
+
+
<%= render template: "layouts/application" %>
diff --git a/app/furniture/marketplace/orders/_order.html.erb b/app/furniture/marketplace/orders/_order.html.erb
index 0203aee07..ca6068233 100644
--- a/app/furniture/marketplace/orders/_order.html.erb
+++ b/app/furniture/marketplace/orders/_order.html.erb
@@ -1,18 +1,15 @@
-<%= render CardComponent.new(classes: "w-full grid grid-cols-6 mt-4") do %>
+<%= render CardComponent.new(classes: "w-full mt-4") do %>
+ Order Summary
<%= link_to(l(order.placed_at.presence || order.created_at, format: :long_ordinal), order.location) %>
-
<%= order.delivery_address %>
-
-
<%- order.ordered_products.each do |ordered_product| %>
<%= ordered_product.name %>
x<%= ordered_product.quantity %>
<%= humanized_money_with_symbol(ordered_product.price) %>
-
<%- if ordered_product.tax_amount.positive? %>
<%= ordered_product.tax_rates.map(&:label).to_sentence %>
@@ -26,11 +23,9 @@
Total
<%= humanized_money_with_symbol(order.price_total) %>
-
- <%- if policy(order.events).index? %>
+ <%- if policy(order.events).index? && order.events.present? %>
-
Timeline
<%- order.events.each do |event| %>
diff --git a/app/furniture/marketplace/orders/index.html.erb b/app/furniture/marketplace/orders/index.html.erb
index 9191ad744..bfad34999 100644
--- a/app/furniture/marketplace/orders/index.html.erb
+++ b/app/furniture/marketplace/orders/index.html.erb
@@ -2,5 +2,5 @@
<%- @pagy, @records = pagy(orders.paid) %>
<%= render @records %>
- <%== pagy_nav(@pagy) %>
+ <%== pagy_nav(@pagy) if @pagy.pages > 1 %>
From 299a634d5d4ddafd16f52054644e8b884dd67742 Mon Sep 17 00:00:00 2001
From: Ross Chapman
Date: Fri, 1 Mar 2024 09:12:03 -0800
Subject: [PATCH 46/53] Fixes absolute paths in Marketplace mailers #2243
(#2257)
---
.../order/email_receipt_component.html.erb | 151 +++++++++---------
spec/factories/furniture/marketplace.rb | 14 +-
2 files changed, 86 insertions(+), 79 deletions(-)
diff --git a/app/furniture/marketplace/order/email_receipt_component.html.erb b/app/furniture/marketplace/order/email_receipt_component.html.erb
index 8feba2698..146e71a6a 100644
--- a/app/furniture/marketplace/order/email_receipt_component.html.erb
+++ b/app/furniture/marketplace/order/email_receipt_component.html.erb
@@ -1,78 +1,81 @@
-
-
- <%= link_to "Order #{order.id}", order.persisted? ? order.location : "#" %>
-
-
- <%= placed_at %>
-
-
-
-
-Products
-<%- order.ordered_products.each do |ordered_product|%>
-
- <%= ordered_product.name %>
- x <%= ordered_product.quantity %>
- <%= humanized_money_with_symbol(ordered_product.price) %>
-
-<%- end %>
-
- Subtotal
-
- <%= humanized_money_with_symbol(order.product_total) %>
-
-Taxes and Fees
-
- Taxes
-
- <%= humanized_money_with_symbol(order.tax_total) %>
-
-
- Delivery
-
- <%= humanized_money_with_symbol(order.delivery_fee) %>
-
-
- Total
-
- <%= humanized_money_with_symbol(order.price_total) %>
-
-
-Delivery Details
-
- Delivery Notes
- <%= order.delivery_notes %>
-
-<%- if order.delivery_area.present? %>
-
- Delivery Schedule:
- <%= render(Marketplace::Cart::DeliveryWindowComponent.new(window: order.delivery_area.delivery_window)) %>
-
-
- Delivering In:
- <%= order.delivery_area.label %>
-
-<%- end %>
-
- Buyer Email:
- <%= order.contact_email %>
-
-
- Phone Number:
- <%= order.contact_phone_number %>
-
-
- Address:
- <%= order.delivery_address %>
-
-
-
+
+ <%= link_to "Order #{order.id}", order.persisted? ? polymorphic_url(order.location) : "#" %>
+
+
+ <%= placed_at %>
+
+
+
+ Products
+
+ <%- order.ordered_products.each do |ordered_product|%>
+
+ <%= ordered_product.name %>
+ x <%= ordered_product.quantity %>
+ <%= humanized_money_with_symbol(ordered_product.price) %>
+
+ <%- end %>
+
+ Subtotal
+
+ <%= humanized_money_with_symbol(order.product_total) %>
+
+
+ Taxes and Fees
+
+
+ Taxes
+
+ <%= humanized_money_with_symbol(order.tax_total) %>
+
+
+ Delivery
+
+ <%= humanized_money_with_symbol(order.delivery_fee) %>
+
+
+ Total
+
+ <%= humanized_money_with_symbol(order.price_total) %>
+
+
+
+ Delivery Details
+
+
+ Delivery Notes
+ <%= order.delivery_notes %>
+
+ <%- if order.delivery_area.present? %>
+
+ Delivery Schedule:
+ <%= render(Marketplace::Cart::DeliveryWindowComponent.new(window: order.delivery_area.delivery_window)) %>
+
+
+ Delivering In:
+ <%= order.delivery_area.label %>
+
+ <%- end %>
+
+ Buyer Email:
+ <%= order.contact_email %>
+
+
+ Phone Number:
+ <%= order.contact_phone_number %>
+
+
+ Address:
+ <%= order.delivery_address %>
+
+
+
diff --git a/spec/factories/furniture/marketplace.rb b/spec/factories/furniture/marketplace.rb
index 0b00e7e8a..1bc074084 100644
--- a/spec/factories/furniture/marketplace.rb
+++ b/spec/factories/furniture/marketplace.rb
@@ -78,7 +78,7 @@
end
factory :marketplace_product, class: "Marketplace::Product" do
- name { Faker::TvShows::DrWho.specie }
+ name { Faker::TvShows::DrWho.unique.specie }
price_cents { Random.rand(1_00..999_99) }
marketplace
@@ -131,7 +131,7 @@
end
factory :marketplace_order, class: "Marketplace::Order" do
- marketplace
+ marketplace { association(:marketplace, :ready_for_shopping) }
shopper { association(:marketplace_shopper) }
status { :paid }
@@ -141,7 +141,7 @@
product_count { 1 }
end
- ordered_products { Array.new(product_count) { association(:marketplace_ordered_product) } }
+ ordered_products { Array.new(product_count) { association(:marketplace_ordered_product, marketplace: marketplace) } }
end
trait :with_taxed_products do
@@ -177,8 +177,12 @@
end
factory :marketplace_ordered_product, class: "Marketplace::OrderedProduct" do
- product factory: :marketplace_product
- order factory: :marketplace_order
+ transient do
+ marketplace { association(:marketplace) }
+ end
+
+ product { association(:marketplace_product, marketplace: marketplace) }
+ order { association(:marketplace_order, marketplace: marketplace) }
quantity { 1 }
end
From dfa3dca7bd78c9bc6c255024ceaf92b01961c66b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Mar 2024 18:57:00 +0000
Subject: [PATCH 47/53] Bump @sentry/browser from 7.103.0 to 7.104.0 (#2261)
---
package.json | 2 +-
yarn.lock | 140 +++++++++++++++++++++++++--------------------------
2 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/package.json b/package.json
index 852075301..b8f36dc0e 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
"@rails/actioncable": "^7.1.3",
"@rails/actiontext": "^7.1.3",
"@rails/activestorage": "^7.1.3",
- "@sentry/browser": "^7.103.0",
+ "@sentry/browser": "^7.104.0",
"@tailwindcss/forms": "^0.5.7",
"@tailwindcss/typography": "^0.5.10",
"@webpack-cli/serve": "^2.0.5",
diff --git a/yarn.lock b/yarn.lock
index dfa20d8c8..fcd7d01f7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -413,76 +413,76 @@
dependencies:
spark-md5 "^3.0.1"
-"@sentry-internal/feedback@7.103.0":
- version "7.103.0"
- resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-7.103.0.tgz#0b382b8fc9fc583be1164ff80df07fbe87b565b3"
- integrity sha512-2nYoCfP7FpiUR+xxO5y5BL2ajHrhM4fL7HSup6QKNn7gI7vLyllYOOuYFNHhSmsXCD0i00U8DBClGLcn+6DQqw==
- dependencies:
- "@sentry/core" "7.103.0"
- "@sentry/types" "7.103.0"
- "@sentry/utils" "7.103.0"
-
-"@sentry-internal/replay-canvas@7.103.0":
- version "7.103.0"
- resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-7.103.0.tgz#d601e56c04fd51b226f6c2933e28a8ce6955e3ba"
- integrity sha512-EyDRMdlSqtwY8zGFhOWwl+nwwo98hlhJz+bpF5PQ6VmFpbplh6Wqfx2p+cPXQr40TGMMC4+vPFlSWTOMjcO9zQ==
- dependencies:
- "@sentry/core" "7.103.0"
- "@sentry/replay" "7.103.0"
- "@sentry/types" "7.103.0"
- "@sentry/utils" "7.103.0"
-
-"@sentry-internal/tracing@7.103.0":
- version "7.103.0"
- resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.103.0.tgz#b18ef65f610099ee2fc74f91f9ccfdb0353580c4"
- integrity sha512-sZ/Wao8HOvGaBs7WlOdflMpHGAFkOBWL6hBiirHaOy5d+IDm7n7et5U6zhvcfiyYBO4nY36gy1Tg5mw+aNO0Vw==
- dependencies:
- "@sentry/core" "7.103.0"
- "@sentry/types" "7.103.0"
- "@sentry/utils" "7.103.0"
-
-"@sentry/browser@^7.103.0":
- version "7.103.0"
- resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.103.0.tgz#b509394d238e67f6225339c242701710ea347508"
- integrity sha512-lP3Oplnwo1lY8ltk8SWzQURbxnSfVhYA099mVs1T95sdwXS16Za6SX7Ld/9T506ZW/WyoU4VCq7eKtG2kPFhMQ==
- dependencies:
- "@sentry-internal/feedback" "7.103.0"
- "@sentry-internal/replay-canvas" "7.103.0"
- "@sentry-internal/tracing" "7.103.0"
- "@sentry/core" "7.103.0"
- "@sentry/replay" "7.103.0"
- "@sentry/types" "7.103.0"
- "@sentry/utils" "7.103.0"
-
-"@sentry/core@7.103.0":
- version "7.103.0"
- resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.103.0.tgz#8f626362c96f9aa4b4a52042c431d16372491dc1"
- integrity sha512-LCI+PIDoF/RLqN41fNXum3ilmS6ukni6L7t38vSdibbe2G0804EbPLtOIpv2PkS8E6CFuRW5zOb+8OwEAAtZWw==
- dependencies:
- "@sentry/types" "7.103.0"
- "@sentry/utils" "7.103.0"
-
-"@sentry/replay@7.103.0":
- version "7.103.0"
- resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.103.0.tgz#6b420f1a33784e76533bb72ea9743e8ad34c0b23"
- integrity sha512-I37komyb+DruQG8lPPPOFxLLbOijNXeTxiWLsIn+KFZqRtKqxxQWdNnk56V4YSTpFzxnMEFMRCpXhncuTWu4LA==
- dependencies:
- "@sentry-internal/tracing" "7.103.0"
- "@sentry/core" "7.103.0"
- "@sentry/types" "7.103.0"
- "@sentry/utils" "7.103.0"
-
-"@sentry/types@7.103.0":
- version "7.103.0"
- resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.103.0.tgz#f413f922216c97ec86bae39f9d527669d8afedbd"
- integrity sha512-NCvKyx8d2AGBQKPARrJemZmZ16DiMo688OEikZg4BbvFNDUzK5Egm2BH0vfLDhbNkU19o3maJowrYo42m8r9Zw==
-
-"@sentry/utils@7.103.0":
- version "7.103.0"
- resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.103.0.tgz#803b76e2adfdcec0d4ab6369cc8990dde19b55f4"
- integrity sha512-phkUJt3F0UOkVq+M4GfdAh2ewI3ASrNiJddx9aO7GnT0aDwwVBHZltnqt95qgAB8W+BipTSt1dAh8yUbbq1Ceg==
- dependencies:
- "@sentry/types" "7.103.0"
+"@sentry-internal/feedback@7.104.0":
+ version "7.104.0"
+ resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-7.104.0.tgz#a2abcfcba3ecd2e6798078bc54841c0146e72b85"
+ integrity sha512-+OWqm+X9ZfEQQmxVoZsc9lpzd85pabAT+bEj57StRMTnfdRbD9TippS20nCD9N2Ql5v2/41NfiPONMejGbnOwg==
+ dependencies:
+ "@sentry/core" "7.104.0"
+ "@sentry/types" "7.104.0"
+ "@sentry/utils" "7.104.0"
+
+"@sentry-internal/replay-canvas@7.104.0":
+ version "7.104.0"
+ resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-7.104.0.tgz#08fa83c150a1e512f138013fc293bf63955ac1a1"
+ integrity sha512-gfdnkFIpxAveKNghkvRCqv+hSiBkxYVoyFZLTvUPuM9Cmvmket1/PpnuWMC2jNtCEewG3gxkPDd4EaT9oa1HZQ==
+ dependencies:
+ "@sentry/core" "7.104.0"
+ "@sentry/replay" "7.104.0"
+ "@sentry/types" "7.104.0"
+ "@sentry/utils" "7.104.0"
+
+"@sentry-internal/tracing@7.104.0":
+ version "7.104.0"
+ resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.104.0.tgz#f5ec0194b7954a92c8e53247bb9b7183bec79abf"
+ integrity sha512-2z7OijM1J5ndJUiJJElC3iH9qb/Eb8eYm2v8oJhM8WVdc5uCKfrQuYHNgGOnmY2FOCfEUlTmMQGpDw7DJ67L5w==
+ dependencies:
+ "@sentry/core" "7.104.0"
+ "@sentry/types" "7.104.0"
+ "@sentry/utils" "7.104.0"
+
+"@sentry/browser@^7.104.0":
+ version "7.104.0"
+ resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.104.0.tgz#8d67bd90645099ad9ed4620df166cfbe6dd53e91"
+ integrity sha512-HsqO+mr1SowGoP0VbuWrQ2DZT0t5PLomy7LEYa6+4lbOemnY+5YV2NSwBTKbjYysvKipSwaRtPhXrsXsMaz8Bg==
+ dependencies:
+ "@sentry-internal/feedback" "7.104.0"
+ "@sentry-internal/replay-canvas" "7.104.0"
+ "@sentry-internal/tracing" "7.104.0"
+ "@sentry/core" "7.104.0"
+ "@sentry/replay" "7.104.0"
+ "@sentry/types" "7.104.0"
+ "@sentry/utils" "7.104.0"
+
+"@sentry/core@7.104.0":
+ version "7.104.0"
+ resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.104.0.tgz#2c6ce6eb6a84b8015bffb25e906407ec1d81a224"
+ integrity sha512-XPndD6IGQGd07/EntvYVzOWQUo/Gd7L3DwYFeEKeBv6ByWjbBNmVZFRhU0GPPsCHKyW9yMU9OO9diLSS4ijsRg==
+ dependencies:
+ "@sentry/types" "7.104.0"
+ "@sentry/utils" "7.104.0"
+
+"@sentry/replay@7.104.0":
+ version "7.104.0"
+ resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.104.0.tgz#de570a5a8cc59671b0e56944d6978809d896f07f"
+ integrity sha512-HmWBr/u+SNeULxCxM8lJb2iqhjizeLGJtuKSShPEguEXIUT4kzdoqLh6wn7BAjiKzhmyjrnBcosR5LUqJtGYZQ==
+ dependencies:
+ "@sentry-internal/tracing" "7.104.0"
+ "@sentry/core" "7.104.0"
+ "@sentry/types" "7.104.0"
+ "@sentry/utils" "7.104.0"
+
+"@sentry/types@7.104.0":
+ version "7.104.0"
+ resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.104.0.tgz#f4458ede188b422827de71e605e7c1faf940103e"
+ integrity sha512-5bs0xe0+GZR4QBm9Nrqw59o0sv3kBtCosrZDVxBru/dQbrfnB+/kVorvuM0rV3+coNITTKcKDegSZmK1d2uOGQ==
+
+"@sentry/utils@7.104.0":
+ version "7.104.0"
+ resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.104.0.tgz#2dec1a3cf2c0bc17e1c14cffab056d5bff15f197"
+ integrity sha512-ZVg+xZirI9DlOi0NegNVocswdh/8p6QkzlQzDQY2LP2CC6JQdmwi64o0S4rPH4YIHNKQJTpIjduoxeKgd1EO5g==
+ dependencies:
+ "@sentry/types" "7.104.0"
"@sindresorhus/merge-streams@^1.0.0":
version "1.0.0"
From 980686e8797a689add001014d589a451a8c08e34 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Mar 2024 18:57:16 +0000
Subject: [PATCH 48/53] Bump yard from 0.9.34 to 0.9.36 (#2262)
---
Gemfile.lock | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index 751fb553d..ebf7ac33e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -530,7 +530,7 @@ GEM
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
- yard (0.9.34)
+ yard (0.9.36)
zeitwerk (2.6.13)
zlib (2.1.1)
From 3fec1641179a4c2c7ded2d4958358c487f07c017 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Mar 2024 19:01:57 +0000
Subject: [PATCH 49/53] Bump pagy from 7.0.6 to 7.0.7 (#2258)
---
Gemfile.lock | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index ebf7ac33e..b54161611 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -293,7 +293,7 @@ GEM
nokogiri (1.16.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
- pagy (7.0.6)
+ pagy (7.0.7)
parallel (1.24.0)
parser (3.3.0.5)
ast (~> 2.4.1)
From d9e77efac4b6d2b323e149a8c7a2c8a0e99b7e0a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Mar 2024 19:02:54 +0000
Subject: [PATCH 50/53] Bump stripe from 10.10.0 to 10.11.0 (#2259)
---
Gemfile.lock | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index b54161611..c1f1ed01e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -497,7 +497,7 @@ GEM
stringio (3.1.0)
strip_attributes (1.13.0)
activemodel (>= 3.0, < 8.0)
- stripe (10.10.0)
+ stripe (10.11.0)
strong_migrations (1.7.0)
activerecord (>= 5.2)
thor (1.3.0)
From eaf649f71290be600af479910854be5aa7467454 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Mar 2024 23:40:56 +0000
Subject: [PATCH 51/53] Bump pagy from 7.0.7 to 7.0.8 (#2265)
---
Gemfile.lock | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index c1f1ed01e..fc6ee5c38 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -293,7 +293,7 @@ GEM
nokogiri (1.16.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
- pagy (7.0.7)
+ pagy (7.0.8)
parallel (1.24.0)
parser (3.3.0.5)
ast (~> 2.4.1)
From 99469f55973b9b28ba54b6c33f50b2efed07cf1d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Mar 2024 23:41:08 +0000
Subject: [PATCH 52/53] Bump autoprefixer from 10.4.17 to 10.4.18 (#2267)
---
package.json | 2 +-
yarn.lock | 27 +++++++++++----------------
2 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/package.json b/package.json
index b8f36dc0e..30c9a0eda 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
"@tailwindcss/forms": "^0.5.7",
"@tailwindcss/typography": "^0.5.10",
"@webpack-cli/serve": "^2.0.5",
- "autoprefixer": "^10.4.17",
+ "autoprefixer": "^10.4.18",
"event-target-shim": "^6.0.2",
"postcss": "^8.4.35",
"postcss-cli": "^11.0.0",
diff --git a/yarn.lock b/yarn.lock
index fcd7d01f7..f292d935a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -748,13 +748,13 @@ arg@^5.0.2:
resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c"
integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==
-autoprefixer@^10.4.17:
- version "10.4.17"
- resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.17.tgz#35cd5695cbbe82f536a50fa025d561b01fdec8be"
- integrity sha512-/cpVNRLSfhOtcGflT13P2794gVSgmPgTR+erw5ifnMLZb0UnSlkK4tquLmkd3BhA+nLo5tX8Cu0upUsGKvKbmg==
+autoprefixer@^10.4.17, autoprefixer@^10.4.18:
+ version "10.4.18"
+ resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.18.tgz#fcb171a3b017be7cb5d8b7a825f5aacbf2045163"
+ integrity sha512-1DKbDfsr6KUElM6wg+0zRNkB/Q7WcKYAaK+pzXn+Xqmszm/5Xa9coeNdtP88Vi+dPzZnMjhge8GIV49ZQkDa+g==
dependencies:
- browserslist "^4.22.2"
- caniuse-lite "^1.0.30001578"
+ browserslist "^4.23.0"
+ caniuse-lite "^1.0.30001591"
fraction.js "^4.3.7"
normalize-range "^0.1.2"
picocolors "^1.0.0"
@@ -785,7 +785,7 @@ braces@^3.0.2, braces@~3.0.2:
dependencies:
fill-range "^7.0.1"
-browserslist@^4.14.5, browserslist@^4.22.2, browserslist@^4.22.3:
+browserslist@^4.14.5, browserslist@^4.22.3, browserslist@^4.23.0:
version "4.23.0"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab"
integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==
@@ -805,15 +805,10 @@ camelcase-css@^2.0.1:
resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5"
integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==
-caniuse-lite@^1.0.30001578:
- version "1.0.30001579"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001579.tgz#45c065216110f46d6274311a4b3fcf6278e0852a"
- integrity sha512-u5AUVkixruKHJjw/pj9wISlcMpgFWzSrczLZbrqBSxukQixmg0SJ5sZTpvaFvxU0HoQKd4yoyAogyrAz9pzJnA==
-
-caniuse-lite@^1.0.30001587:
- version "1.0.30001588"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001588.tgz#07f16b65a7f95dba82377096923947fb25bce6e3"
- integrity sha512-+hVY9jE44uKLkH0SrUTqxjxqNTOWHsbnQDIKjwkZ3lNTzUUVdBLBGXtj/q5Mp5u98r3droaZAewQuEDzjQdZlQ==
+caniuse-lite@^1.0.30001587, caniuse-lite@^1.0.30001591:
+ version "1.0.30001591"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001591.tgz#16745e50263edc9f395895a7cd468b9f3767cf33"
+ integrity sha512-PCzRMei/vXjJyL5mJtzNiUCKP59dm8Apqc3PH8gJkMnMXZGox93RbE76jHsmLwmIo6/3nsYIpJtx0O7u5PqFuQ==
chokidar@^3.3.0, chokidar@^3.5.3:
version "3.5.3"
From 6822ec80c248b270b2c0325ebdbb84af8807bee1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Mar 2024 23:41:23 +0000
Subject: [PATCH 53/53] Bump pg from 1.5.5 to 1.5.6 (#2264)
---
Gemfile.lock | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index fc6ee5c38..3f9c58b0a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -298,7 +298,7 @@ GEM
parser (3.3.0.5)
ast (~> 2.4.1)
racc
- pg (1.5.5)
+ pg (1.5.6)
pry (0.14.1)
coderay (~> 1.1)
method_source (~> 1.0)