mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2025-01-18 19:44:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
24273 commits 5 branches 150 tags 287 MiB
Commit graph

4077 commits

Author SHA1 Message Date
Jeremy Kescher
b6d249fd0f
Merge branch 'upstream-main' into patches/emoji-reactions-main 2025-01-16 18:23:27 +01:00
Claire
f6a0cd9d1a Merge commit 'da4e55eb17e459fbc6d1a19fac3303508324324c' into glitch-soc/merge-upstream 2025-01-16 11:16:53 +01:00
github-actions[bot]
4a44c47982
New Crowdin Translations (automated) (#33609) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-16 09:13:39 +00:00
Claire
ab152ebed4 Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/status.rb`:
  Upstream refactored `visibility` handling to a concern, while glitch-soc had
  custom code adjacent to some of the changed lines.
  Applied upstream's changes.
- `lib/mastodon/version.rb`:
  Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's
  default github repository had been modified.
  Applied upstream's changes and updated `config/mastodon.yml` accordingly.
 2025-01-14 20:38:32 +01:00
Matt Jankowski
7c56517c7c
Move mastodon version config to config_for yml (#33577) 2025-01-14 14:32:29 +00:00
github-actions[bot]
ee4edbb94f
New Crowdin Translations (automated) (#33582) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-14 08:44:58 +00:00
github-actions[bot]
53885b0fdb
New Crowdin Translations (automated) (#33559) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-13 09:13:47 +00:00
Claire
155dc4bc4b Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream 
Conflicts:
- `CONTRIBUTING.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `README.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `app/helpers/application_helper.rb`:
  Upstream added helpers where glitch-soc had extra ones.
  Added upstream's new helpers.
- `app/models/form/admin_settings.rb`:
  Upstream added some custom handling of one setting, while
  glitch-soc had additional code.
  Ported upstream's code.
- `lib/mastodon/version.rb`:
  Upstream moved some things to `config/mastodon.yml`.
  Did the same.
- `spec/requests/api/v1/accounts/credentials_spec.rb`:
  I don't know honestly.
 2025-01-10 20:41:36 +01:00
Matt Jankowski
34cd7d6585
Use config_for for Mastodon::Version metadata/prerelease values (#33548) 2025-01-10 15:52:43 +00:00
github-actions[bot]
846c89b66e
New Crowdin Translations (automated) (#33541) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-10 09:00:41 +00:00
github-actions[bot]
4e2c15b45d
New Crowdin Translations (automated) (#33522) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-09 08:21:47 +00:00
github-actions[bot]
35e57138f1
New Crowdin Translations (automated) (#33500) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-08 09:01:28 +00:00
Matt Jankowski
c0264c8013
Extend custom CSS cache time with digest paths (#33207) 2025-01-08 08:48:45 +00:00
github-actions[bot]
9715bd796f
New Crowdin Translations (automated) (#33480) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-07 07:50:27 +00:00
Claire
126ce9a232 Merge commit '82d2ce293d98a2b9e024bc5396c3586904d46ae5' into glitch-soc/merge-upstream 2025-01-06 20:36:25 +01:00
Matt Jankowski
fbd283329e
Avoid "double icon" near each other in nav sidebar (#33449) 2025-01-06 18:24:39 +00:00
github-actions[bot]
c93c1f38b7
New Crowdin Translations (automated) (#33451) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-06 08:13:39 +00:00
Essem
ecca25fb06
Add notification emails for reactions 2025-01-04 18:38:43 -06:00
Essem
d10574b3a2
Add support for emoji reactions 
Squashed, modified, and rebased from glitch-soc/mastodon#2221.

Co-authored-by: fef <owo@fef.moe>
Co-authored-by: Jeremy Kescher <jeremy@kescher.at>
Co-authored-by: neatchee <neatchee@gmail.com>
Co-authored-by: Ivan Rodriguez <104603218+IRod22@users.noreply.github.com>
Co-authored-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2025-01-04 18:38:43 -06:00
Tim Rogers
3bdfa3eb4c
Added validator for extra profile field values with empty name (#33421) 2025-01-04 19:42:27 +00:00
Claire
163a8569ed Merge commit '9b82bedc6f589b19c1cf9dc8f566f4c19702d965' into glitch-soc/merge-upstream 2025-01-04 18:55:35 +01:00
Matt Jankowski
9b82bedc6f
Only register stats dirs when command available (#33454) 2025-01-04 17:44:49 +00:00
Claire
807bf8be24 Merge commit '9712518b2fb2585df3bcff95a687c291f04a4199' into glitch-soc/merge-upstream 2025-01-04 15:27:49 +01:00
Matt Jankowski
af7d6e59af
Replace deprecated STATS_DIRECTORIES with Rails::CodeStatistics.register_directory approach (#33445) 2025-01-03 21:52:16 +00:00
Claire
7e1f8babbd Merge commit '7d6da219c0fccb8693282a99765135050173d7c4' into glitch-soc/merge-upstream 2025-01-03 20:26:28 +01:00
Matt Jankowski
535866218e
Update rails to version 8.0.1 (#32357) 2025-01-03 16:08:21 +00:00
Claire
68106f250c Merge commit '6ffa251d6ad239d1ad2b95e784c3a7a21cbf50e8' into glitch-soc/merge-upstream 2025-01-03 12:34:47 +01:00
github-actions[bot]
a8a16695f1
New Crowdin Translations (automated) (#33439) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-03 07:53:00 +00:00
Claire
cef665788a Merge commit '8e3fd1b8236448f01221b1d7745736e50de51e11' into glitch-soc/merge-upstream 2025-01-02 21:14:14 +01:00
github-actions[bot]
ba18289477
New Crowdin Translations (automated) (#33378) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-02 09:02:47 +00:00
Claire
0aa69487a2 Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `config/routes.rb`:
  Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
  an extra route.
  Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
  This spec got converted to a system spec upstream.
  However, the theme setting works differently in glitch-soc, so the spec had been
  changed.
  Changed the corresponding system spec as well.
 2024-12-25 18:01:37 +01:00
github-actions[bot]
76efddfc57
New Crowdin Translations (automated) (#2907) 
* New Crowdin translations

* Fix bogus no.yml

* Fix bogus simple_form.no.yml

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-23 18:28:38 +01:00
Renaud Chaput
22813dbc6e
Fix /health endpoint when OTEL is configured (#33362) 2024-12-19 10:44:44 +00:00
github-actions[bot]
7a08fe91b5
New Crowdin Translations (automated) (#33358) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-19 08:47:20 +00:00
Renaud Chaput
3f8f06eb46
Add support for Active Record query log tags (#33342) 2024-12-18 10:05:00 +00:00
github-actions[bot]
1992c2a4fa
New Crowdin Translations (automated) (#33345) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-18 07:51:31 +00:00
Renaud Chaput
3febe7d020
Add OTEL trace & span IDs to logs (#33339) 2024-12-18 07:34:20 +00:00
Matt Jankowski
3f9ac22af3
Remove empty/unused config/storage.yml file (#33341) 2024-12-18 07:25:14 +00:00
Claire
1712543c68
Revert "Support animated PNGs in media attachments (#28516)" (#33334) 2024-12-17 10:52:59 +00:00
github-actions[bot]
02748f172d
New Crowdin Translations (automated) (#33332) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-17 09:33:42 +00:00
github-actions[bot]
504ea31bd3
New Crowdin Translations (automated) (#33310) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-16 07:54:12 +00:00
github-actions[bot]
7200f9d25c
New Crowdin Translations (automated) (#33300) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-13 10:38:09 +00:00
Robb Kidd
d580607510
don't start OTel traces with Redis spans (#33090) 2024-12-13 08:21:38 +00:00
Matt Jankowski
bc5b9d98a5
Remove unused admin/terms_of_service routes (#33288) 2024-12-12 20:17:15 +00:00
github-actions[bot]
e0a49af47d
New Crowdin Translations (automated) (#33280) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-12 09:10:00 +00:00
github-actions[bot]
f12b3a9cef
New Crowdin Translations (automated) (#33262) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-11 08:20:44 +00:00
Christian Schmidt
a70ae28644
Support animated PNGs in media attachments (#28516) 2024-12-11 02:28:21 +00:00
Renaud Chaput
2a369a8977
Use a system setting for the Referer policy (#33239) 2024-12-10 13:16:52 +00:00
github-actions[bot]
801cd731be
New Crowdin Translations (automated) (#33235) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-10 09:10:28 +00:00
Matt Jankowski
2131e61548
Fix hard wrap of markdown list in TOS template (#33230) 2024-12-10 01:43:03 +00:00