Merge branch 'main' into dependabot/bundler/rails-ab922041a0

veganstraightedge · web-flow · commit 54b96b94efb1 · 2024-11-21T13:38:14.000-08:00
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -79,7 +79,7 @@ GEM
       execjs (~> 2)
     awesome_print (1.9.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.1010.0)
+    aws-partitions (1.1011.0)
     aws-sdk-core (3.213.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
@@ -460,7 +460,7 @@ GEM
       websocket (~> 1.0)
     sexp_processor (4.17.3)
     shellany (0.0.1)
-    sidekiq (7.3.5)
+    sidekiq (7.3.6)
       connection_pool (>= 2.3.0)
       logger
       rack (>= 2.2.4)
diff --git a/config/locales/pages/ar/about.markdown b/config/locales/pages/ar/about.markdown
@@ -19,8 +19,11 @@
 _Email:_ \\
 [contact@crimethinc.com](mailto:contact@crimethinc.com)
 
-_Twitter:_ \\
-[@crimethinc](https://twitter.com/crimethinc)
+_Mastodon:_ \\
+[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
+
+_Bluesky:_ \\
+[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
 
 ## Mailorder
 
diff --git a/config/locales/pages/be/about.markdown b/config/locales/pages/be/about.markdown
@@ -19,8 +19,11 @@
 _Email:_ \\
 [contact@crimethinc.com](mailto:contact@crimethinc.com)
 
-_Twitter:_ \\
-[@crimethinc](https://twitter.com/crimethinc)
+_Mastodon:_ \\
+[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
+
+_Bluesky:_ \\
+[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
 
 ## Mailorder
 
diff --git a/config/locales/pages/bg/about.markdown b/config/locales/pages/bg/about.markdown
@@ -19,8 +19,11 @@
 _Email:_ \\
 [contact@crimethinc.com](mailto:contact@crimethinc.com)
 
-_Twitter:_ \\
-[@crimethinc](https://twitter.com/crimethinc)
+_Mastodon:_ \\
+[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
+
+_Bluesky:_ \\
+[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
 
 ## Mailorder
 
diff --git a/config/locales/pages/bn/about.markdown b/config/locales/pages/bn/about.markdown
@@ -19,8 +19,11 @@
 _Email:_ \\
 [contact@crimethinc.com](mailto:contact@crimethinc.com)
 
-_Twitter:_ \\
-[@crimethinc](https://twitter.com/crimethinc)
+_Mastodon:_ \\
+[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
+
+_Bluesky:_ \\
+[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
 
 ## Mailorder
 
diff --git a/config/locales/pages/cs/about.markdown b/config/locales/pages/cs/about.markdown
@@ -19,8 +19,11 @@
 _Email:_ \\
 [contact@crimethinc.com](mailto:contact@crimethinc.com)
 
-_Twitter:_ \\
-[@crimethinc](https://twitter.com/crimethinc)
+_Mastodon:_ \\
+[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
+
+_Bluesky:_ \\
+[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
 
 ## Mailorder
 
diff --git a/config/locales/pages/cz/about.markdown b/config/locales/pages/cz/about.markdown
@@ -19,8 +19,11 @@
 _Email:_ \\
 [contact@crimethinc.com](mailto:contact@crimethinc.com)
 
-_Twitter:_ \\
-[@crimethinc](https://twitter.com/crimethinc)
+_Mastodon:_ \\
+[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
+
+_Bluesky:_ \\
+[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
 
 ## Mailorder
 
diff --git a/config/locales/pages/da/about.markdown b/config/locales/pages/da/about.markdown
@@ -19,8 +19,11 @@
 _Email:_ \\
 [contact@crimethinc.com](mailto:contact@crimethinc.com)
 
-_Twitter:_ \\
-[@crimethinc](https://twitter.com/crimethinc)
+_Mastodon:_ \\
+[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
+
+_Bluesky:_ \\
+[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
 
 ## Mailorder
 
diff --git a/config/locales/pages/de/about.markdown b/config/locales/pages/de/about.markdown
@@ -19,8 +19,11 @@
 _Email:_ \\
 [contact@crimethinc.com](mailto:contact@crimethinc.com)
 
-_Twitter:_ \\
-[@crimethinc](https://twitter.com/crimethinc)
+_Mastodon:_ \\
+[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
+
+_Bluesky:_ \\
+[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
 
 ## Mailorder
 
diff --git a/config/locales/pages/dv/about.markdown b/config/locales/pages/dv/about.markdown
@@ -19,8 +19,11 @@
 _Email:_ \\
 [contact@crimethinc.com](mailto:contact@crimethinc.com)
 
-_Twitter:_ \\
-[@crimethinc](https://twitter.com/crimethinc)
+_Mastodon:_ \\
+[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
+
+_Bluesky:_ \\
+[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
 
 ## Mailorder
 
diff --git a/config/locales/pages/en/about.markdown b/config/locales/pages/en/about.markdown
@@ -19,8 +19,11 @@
 _Email:_ \\
 [contact@crimethinc.com](mailto:contact@crimethinc.com)
 
-_Twitter:_ \\
-[@crimethinc](https://twitter.com/crimethinc)
+_Mastodon:_ \\
+[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
+
+_Bluesky:_ \\
+[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
 
 ## Mailorder
 
diff --git a/config/locales/pages/es/about.markdown b/config/locales/pages/es/about.markdown
@@ -19,8 +19,11 @@
 _Email:_ \\
 [contact@crimethinc.com](mailto:contact@crimethinc.com)
 
-_Twitter:_ \\
-[@crimethinc](https://twitter.com/crimethinc)
+_Mastodon:_ \\
+[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
+
+_Bluesky:_ \\
+[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
 
 ## Mailorder
 
diff --git a/config/locales/pages/eu/about.markdown b/config/locales/pages/eu/about.markdown
@@ -19,8 +19,11 @@
 _Email:_ \\
 [contact@crimethinc.com](mailto:contact@crimethinc.com)
 
-_Twitter:_ \\
-[@crimethinc](https://twitter.com/crimethinc)
+_Mastodon:_ \\
+[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
+
+_Bluesky:_ \\
+[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
 
 ## Mailorder
 
diff --git a/config/locales/pages/fa/about.markdown b/config/locales/pages/fa/about.markdown
@@ -19,8 +19,11 @@
 _Email:_ \\
 [contact@crimethinc.com](mailto:contact@crimethinc.com)
 
-_Twitter:_ \\
-[@crimethinc](https://twitter.com/crimethinc)
+_Mastodon:_ \\
+[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
+
+_Bluesky:_ \\
+[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
 
 ## Mailorder
 
diff --git a/config/locales/pages/fi/about.markdown b/config/locales/pages/fi/about.markdown
@@ -19,8 +19,11 @@
 _Email:_ \\
 [contact@crimethinc.com](mailto:contact@crimethinc.com)
 
-_Twitter:_ \\
-[@crimethinc](https://twitter.com/crimethinc)
+_Mastodon:_ \\
+[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
+
+_Bluesky:_ \\
+[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
 
 ## Mailorder
 
diff --git a/config/locales/pages/fr/about.markdown b/config/locales/pages/fr/about.markdown
@@ -19,8 +19,11 @@
 _Email:_ \\
 [contact@crimethinc.com](mailto:contact@crimethinc.com)
 
-_Twitter:_ \\
-[@crimethinc](https://twitter.com/crimethinc)
+_Mastodon:_ \\
+[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
+
+_Bluesky:_ \\
+[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
 
 ## Mailorder
 
diff --git a/config/locales/pages/gl/about.markdown b/config/locales/pages/gl/about.markdown
@@ -19,8 +19,11 @@
 _Email:_ \\
 [contact@crimethinc.com](mailto:contact@crimethinc.com)
 
-_Twitter:_ \\
-[@crimethinc](https://twitter.com/crimethinc)
+_Mastodon:_ \\
+[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
+
+_Bluesky:_ \\
+[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
 
 ## Mailorder
 
diff --git a/config/locales/pages/gr/about.markdown b/config/locales/pages/gr/about.markdown
@@ -19,8 +19,11 @@
 _Email:_ \\
 [contact@crimethinc.com](mailto:contact@crimethinc.com)
 
-_Twitter:_ \\
-[@crimethinc](https://twitter.com/crimethinc)
+_Mastodon:_ \\
+[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
+
+_Bluesky:_ \\
+[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
 
 ## Mailorder
 
diff --git a/config/locales/pages/he/about.markdown b/config/locales/pages/he/about.markdown
@@ -19,8 +19,11 @@
 _Email:_ \\
 [contact@crimethinc.com](mailto:contact@crimethinc.com)
 
-_Twitter:_ \\
-[@crimethinc](https://twitter.com/crimethinc)
+_Mastodon:_ \\
+[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
+
+_Bluesky:_ \\
+[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
 
 ## Mailorder
 
diff --git a/config/locales/pages/hu/about.markdown b/config/locales/pages/hu/about.markdown
@@ -19,8 +19,11 @@
 _Email:_ \\
 [contact@crimethinc.com](mailto:contact@crimethinc.com)
 
-_Twitter:_ \\
-[@crimethinc](https://twitter.com/crimethinc)
+_Mastodon:_ \\
+[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
+
+_Bluesky:_ \\
+[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
 
 ## Mailorder
 
diff --git a/config/locales/pages/id/about.markdown b/config/locales/pages/id/about.markdown
@@ -19,8 +19,11 @@
 _Email:_ \\
 [contact@crimethinc.com](mailto:contact@crimethinc.com)
 
-_Twitter:_ \\
-[@crimethinc](https://twitter.com/crimethinc)
+_Mastodon:_ \\
+[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
+
+_Bluesky:_ \\
+[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
 
 ## Mailorder
 
diff --git a/config/locales/pages/it/about.markdown b/config/locales/pages/it/about.markdown
@@ -19,8 +19,11 @@
 _E-mail:_ \\
 [contact@crimethinc.com](mailto:contact@crimethinc.com)
 
-_Twitter:_ \\
-[@crimethinc](https://twitter.com/crimethinc)
+_Mastodon:_ \\
+[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
+
+_Bluesky:_ \\
+[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
 
 ## Vendita per corrispondenza
 
diff --git a/config/locales/pages/ja/about.markdown b/config/locales/pages/ja/about.markdown
@@ -19,8 +19,11 @@
 _Email:_ \\
 [contact@crimethinc.com](mailto:contact@crimethinc.com)
 
-_Twitter:_ \\
-[@crimethinc](https://twitter.com/crimethinc)
+_Mastodon:_ \\
+[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
+
+_Bluesky:_ \\
+[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
 
 ## Mailorder
 
diff --git a/config/locales/pages/ko/about.markdown b/config/locales/pages/ko/about.markdown
@@ -19,8 +19,11 @@
 _Email:_ \\
 [contact@crimethinc.com](mailto:contact@crimethinc.com)
 
-_Twitter:_ \\
-[@crimethinc](https://twitter.com/crimethinc)
+_Mastodon:_ \\
+[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
+
+_Bluesky:_ \\
+[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
 
 ## Mailorder
 
diff --git a/config/locales/pages/ku/about.markdown b/config/locales/pages/ku/about.markdown
@@ -19,8 +19,11 @@
 _Email:_ \\
 [contact@crimethinc.com](mailto:contact@crimethinc.com)
 
-_Twitter:_ \\
-[@crimethinc](https://twitter.com/crimethinc)
+_Mastodon:_ \\
+[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
+
+_Bluesky:_ \\
+[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
 
 ## Mailorder
 
diff --git a/config/locales/pages/nl/about.markdown b/config/locales/pages/nl/about.markdown
@@ -19,8 +19,11 @@
 _Email:_ \\
 [contact@crimethinc.com](mailto:contact@crimethinc.com)
 
-_Twitter:_ \\
-[@crimethinc](https://twitter.com/crimethinc)
+_Mastodon:_ \\
+[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
+
+_Bluesky:_ \\
+[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
 
 ## Mailorder
 
diff --git a/config/locales/pages/no/about.markdown b/config/locales/pages/no/about.markdown
@@ -19,8 +19,11 @@
 _Email:_ \\
 [contact@crimethinc.com](mailto:contact@crimethinc.com)
 
-_Twitter:_ \\
-[@crimethinc](https://twitter.com/crimethinc)
+_Mastodon:_ \\
+[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
+
+_Bluesky:_ \\
+[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
 
 ## Mailorder
 
diff --git a/config/locales/pages/pl/about.markdown b/config/locales/pages/pl/about.markdown
@@ -19,8 +19,11 @@
 _Email:_ \\
 [contact@crimethinc.com](mailto:contact@crimethinc.com)
 
-_Twitter:_ \\
-[@crimethinc](https://twitter.com/crimethinc)
+_Mastodon:_ \\
+[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
+
+_Bluesky:_ \\
+[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
 
 ## Mailorder
 
diff --git a/config/locales/pages/pt/about.markdown b/config/locales/pages/pt/about.markdown
diff --git a/config/locales/pages/ro/about.markdown b/config/locales/pages/ro/about.markdown
diff --git a/config/locales/pages/ru/about.markdown b/config/locales/pages/ru/about.markdown
diff --git a/config/locales/pages/sk/about.markdown b/config/locales/pages/sk/about.markdown
diff --git a/config/locales/pages/sl/about.markdown b/config/locales/pages/sl/about.markdown
diff --git a/config/locales/pages/sv/about.markdown b/config/locales/pages/sv/about.markdown
diff --git a/config/locales/pages/th/about.markdown b/config/locales/pages/th/about.markdown
diff --git a/config/locales/pages/tl/about.markdown b/config/locales/pages/tl/about.markdown
diff --git a/config/locales/pages/tr/about.markdown b/config/locales/pages/tr/about.markdown
diff --git a/config/locales/pages/uk/about.markdown b/config/locales/pages/uk/about.markdown
diff --git a/config/locales/pages/vi/about.markdown b/config/locales/pages/vi/about.markdown
diff --git a/config/locales/pages/zh/about.markdown b/config/locales/pages/zh/about.markdown
