Skip to content

Commit 91ee516

Browse files
veganstraightedgeveganstraightedge
authored
Merge branch 'main' into dependabot/bundler/ruby-lsp-0.22.0
2 parents 66e78a7 + 8f2b103 commit 91ee516

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+200
-83
lines changed

‎Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
33
ruby file: '.ruby-version'
44

55
# app server
6-
gem 'rails'
6+
gem 'rails', '~> 7.2.2'
77

88
# database
99
gem 'pg'

‎Gemfile.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ GEM
7979
execjs (~> 2)
8080
awesome_print (1.9.2)
8181
aws-eventstream (1.3.0)
82-
aws-partitions (1.1010.0)
82+
aws-partitions (1.1011.0)
8383
aws-sdk-core (3.213.0)
8484
aws-eventstream (~> 1, >= 1.3.0)
8585
aws-partitions (~> 1, >= 1.992.0)
@@ -259,7 +259,7 @@ GEM
259259
method_source (1.1.0)
260260
mini_magick (4.13.2)
261261
mini_mime (1.1.5)
262-
minitest (5.25.1)
262+
minitest (5.25.2)
263263
nenv (0.3.0)
264264
net-imap (0.5.1)
265265
date
@@ -460,7 +460,7 @@ GEM
460460
websocket (~> 1.0)
461461
sexp_processor (4.17.3)
462462
shellany (0.0.1)
463-
sidekiq (7.3.5)
463+
sidekiq (7.3.6)
464464
connection_pool (>= 2.3.0)
465465
logger
466466
rack (>= 2.2.4)
@@ -560,7 +560,7 @@ DEPENDENCIES
560560
rack-attack
561561
rack-contrib
562562
rack-timeout
563-
rails
563+
rails (~> 7.2.2)
564564
rails-controller-testing
565565
rails-erd
566566
redis

‎config/locales/pages/ar/about.markdown

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
_Email:_ \\
2020
[[email protected]](mailto:[email protected])
2121

22-
_Twitter:_ \\
23-
[@crimethinc](https://twitter.com/crimethinc)
22+
_Mastodon:_ \\
23+
[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
24+
25+
_Bluesky:_ \\
26+
[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
2427

2528
## Mailorder
2629

‎config/locales/pages/be/about.markdown

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
_Email:_ \\
2020
[[email protected]](mailto:[email protected])
2121

22-
_Twitter:_ \\
23-
[@crimethinc](https://twitter.com/crimethinc)
22+
_Mastodon:_ \\
23+
[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
24+
25+
_Bluesky:_ \\
26+
[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
2427

2528
## Mailorder
2629

‎config/locales/pages/bg/about.markdown

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
_Email:_ \\
2020
[[email protected]](mailto:[email protected])
2121

22-
_Twitter:_ \\
23-
[@crimethinc](https://twitter.com/crimethinc)
22+
_Mastodon:_ \\
23+
[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
24+
25+
_Bluesky:_ \\
26+
[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
2427

2528
## Mailorder
2629

‎config/locales/pages/bn/about.markdown

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
_Email:_ \\
2020
[[email protected]](mailto:[email protected])
2121

22-
_Twitter:_ \\
23-
[@crimethinc](https://twitter.com/crimethinc)
22+
_Mastodon:_ \\
23+
[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
24+
25+
_Bluesky:_ \\
26+
[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
2427

2528
## Mailorder
2629

‎config/locales/pages/cs/about.markdown

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
_Email:_ \\
2020
[[email protected]](mailto:[email protected])
2121

22-
_Twitter:_ \\
23-
[@crimethinc](https://twitter.com/crimethinc)
22+
_Mastodon:_ \\
23+
[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
24+
25+
_Bluesky:_ \\
26+
[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
2427

2528
## Mailorder
2629

‎config/locales/pages/cz/about.markdown

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
_Email:_ \\
2020
[[email protected]](mailto:[email protected])
2121

22-
_Twitter:_ \\
23-
[@crimethinc](https://twitter.com/crimethinc)
22+
_Mastodon:_ \\
23+
[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
24+
25+
_Bluesky:_ \\
26+
[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
2427

2528
## Mailorder
2629

‎config/locales/pages/da/about.markdown

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
_Email:_ \\
2020
[[email protected]](mailto:[email protected])
2121

22-
_Twitter:_ \\
23-
[@crimethinc](https://twitter.com/crimethinc)
22+
_Mastodon:_ \\
23+
[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
24+
25+
_Bluesky:_ \\
26+
[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
2427

2528
## Mailorder
2629

‎config/locales/pages/de/about.markdown

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
_Email:_ \\
2020
[[email protected]](mailto:[email protected])
2121

22-
_Twitter:_ \\
23-
[@crimethinc](https://twitter.com/crimethinc)
22+
_Mastodon:_ \\
23+
[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
24+
25+
_Bluesky:_ \\
26+
[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
2427

2528
## Mailorder
2629

‎config/locales/pages/dv/about.markdown

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
_Email:_ \\
2020
[[email protected]](mailto:[email protected])
2121

22-
_Twitter:_ \\
23-
[@crimethinc](https://twitter.com/crimethinc)
22+
_Mastodon:_ \\
23+
[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
24+
25+
_Bluesky:_ \\
26+
[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
2427

2528
## Mailorder
2629

‎config/locales/pages/en/about.markdown

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
_Email:_ \\
2020
[[email protected]](mailto:[email protected])
2121

22-
_Twitter:_ \\
23-
[@crimethinc](https://twitter.com/crimethinc)
22+
_Mastodon:_ \\
23+
[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
24+
25+
_Bluesky:_ \\
26+
[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
2427

2528
## Mailorder
2629

‎config/locales/pages/es/about.markdown

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
_Email:_ \\
2020
[[email protected]](mailto:[email protected])
2121

22-
_Twitter:_ \\
23-
[@crimethinc](https://twitter.com/crimethinc)
22+
_Mastodon:_ \\
23+
[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
24+
25+
_Bluesky:_ \\
26+
[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
2427

2528
## Mailorder
2629

‎config/locales/pages/eu/about.markdown

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
_Email:_ \\
2020
[[email protected]](mailto:[email protected])
2121

22-
_Twitter:_ \\
23-
[@crimethinc](https://twitter.com/crimethinc)
22+
_Mastodon:_ \\
23+
[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
24+
25+
_Bluesky:_ \\
26+
[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
2427

2528
## Mailorder
2629

‎config/locales/pages/fa/about.markdown

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
_Email:_ \\
2020
[[email protected]](mailto:[email protected])
2121

22-
_Twitter:_ \\
23-
[@crimethinc](https://twitter.com/crimethinc)
22+
_Mastodon:_ \\
23+
[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
24+
25+
_Bluesky:_ \\
26+
[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
2427

2528
## Mailorder
2629

‎config/locales/pages/fi/about.markdown

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
_Email:_ \\
2020
[[email protected]](mailto:[email protected])
2121

22-
_Twitter:_ \\
23-
[@crimethinc](https://twitter.com/crimethinc)
22+
_Mastodon:_ \\
23+
[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
24+
25+
_Bluesky:_ \\
26+
[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
2427

2528
## Mailorder
2629

‎config/locales/pages/fr/about.markdown

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
_Email:_ \\
2020
[[email protected]](mailto:[email protected])
2121

22-
_Twitter:_ \\
23-
[@crimethinc](https://twitter.com/crimethinc)
22+
_Mastodon:_ \\
23+
[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
24+
25+
_Bluesky:_ \\
26+
[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
2427

2528
## Mailorder
2629

‎config/locales/pages/gl/about.markdown

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
_Email:_ \\
2020
[[email protected]](mailto:[email protected])
2121

22-
_Twitter:_ \\
23-
[@crimethinc](https://twitter.com/crimethinc)
22+
_Mastodon:_ \\
23+
[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
24+
25+
_Bluesky:_ \\
26+
[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
2427

2528
## Mailorder
2629

‎config/locales/pages/gr/about.markdown

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
_Email:_ \\
2020
[[email protected]](mailto:[email protected])
2121

22-
_Twitter:_ \\
23-
[@crimethinc](https://twitter.com/crimethinc)
22+
_Mastodon:_ \\
23+
[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
24+
25+
_Bluesky:_ \\
26+
[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
2427

2528
## Mailorder
2629

‎config/locales/pages/he/about.markdown

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
_Email:_ \\
2020
[[email protected]](mailto:[email protected])
2121

22-
_Twitter:_ \\
23-
[@crimethinc](https://twitter.com/crimethinc)
22+
_Mastodon:_ \\
23+
[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
24+
25+
_Bluesky:_ \\
26+
[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
2427

2528
## Mailorder
2629

‎config/locales/pages/hu/about.markdown

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
_Email:_ \\
2020
[[email protected]](mailto:[email protected])
2121

22-
_Twitter:_ \\
23-
[@crimethinc](https://twitter.com/crimethinc)
22+
_Mastodon:_ \\
23+
[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
24+
25+
_Bluesky:_ \\
26+
[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
2427

2528
## Mailorder
2629

‎config/locales/pages/id/about.markdown

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
_Email:_ \\
2020
[[email protected]](mailto:[email protected])
2121

22-
_Twitter:_ \\
23-
[@crimethinc](https://twitter.com/crimethinc)
22+
_Mastodon:_ \\
23+
[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
24+
25+
_Bluesky:_ \\
26+
[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
2427

2528
## Mailorder
2629

‎config/locales/pages/it/about.markdown

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
_E-mail:_ \\
2020
[[email protected]](mailto:[email protected])
2121

22-
_Twitter:_ \\
23-
[@crimethinc](https://twitter.com/crimethinc)
22+
_Mastodon:_ \\
23+
[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
24+
25+
_Bluesky:_ \\
26+
[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
2427

2528
## Vendita per corrispondenza
2629

‎config/locales/pages/ja/about.markdown

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
_Email:_ \\
2020
[[email protected]](mailto:[email protected])
2121

22-
_Twitter:_ \\
23-
[@crimethinc](https://twitter.com/crimethinc)
22+
_Mastodon:_ \\
23+
[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
24+
25+
_Bluesky:_ \\
26+
[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
2427

2528
## Mailorder
2629

‎config/locales/pages/ko/about.markdown

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
_Email:_ \\
2020
[[email protected]](mailto:[email protected])
2121

22-
_Twitter:_ \\
23-
[@crimethinc](https://twitter.com/crimethinc)
22+
_Mastodon:_ \\
23+
[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
24+
25+
_Bluesky:_ \\
26+
[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
2427

2528
## Mailorder
2629

‎config/locales/pages/ku/about.markdown

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
_Email:_ \\
2020
[[email protected]](mailto:[email protected])
2121

22-
_Twitter:_ \\
23-
[@crimethinc](https://twitter.com/crimethinc)
22+
_Mastodon:_ \\
23+
[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
24+
25+
_Bluesky:_ \\
26+
[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
2427

2528
## Mailorder
2629

‎config/locales/pages/nl/about.markdown

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
_Email:_ \\
2020
[[email protected]](mailto:[email protected])
2121

22-
_Twitter:_ \\
23-
[@crimethinc](https://twitter.com/crimethinc)
22+
_Mastodon:_ \\
23+
[@crimethinc@todon.eu](https://todon.eu/@CrimethInc)
24+
25+
_Bluesky:_ \\
26+
[@crimethinc.bsky.social](https://bsky.app/profile/crimethinc.bsky.social)
2427

2528
## Mailorder
2629

0 commit comments

Comments
 (0)