Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-27 13:16:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,442 Commits 74 Branches 58 Tags
0bb83dfe7dc6e91d0d12400d6fbf8a8b62c3c020
Commit Graph

4310 Commits

Author SHA1 Message Date
Claire
0bb83dfe7d Merge commit '69f298731e523f7f2e97ddd6a559dfb485d4495c' into glitch-soc/merge-upstream 2025-06-16 21:07:55 +02:00
Claire
2c751a6a19 Merge commit 'c644413f8a068490ddb8038441e5b59112e8294e' into glitch-soc/merge-upstream 2025-06-16 20:08:52 +02:00
github-actions[bot]
77862311cf New Crowdin Translations (automated) (#3041) 
* New Crowdin translations

* Update no.yml

* Update simple_form.no.yml

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-16 20:07:18 +02:00
Claire
013c527406 Fix vite helpers crash in development mode (#35035) 
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com>
 2025-06-16 14:25:12 +00:00
github-actions[bot]
070455cad0 New Crowdin Translations (automated) (#35044) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-16 06:26:25 +00:00
Matt Jankowski
6f2aba989f Move "limited federation mode" config to x.mastodon area (#35041) 2025-06-16 06:13:03 +00:00
Claire
7da6b07c75 Merge commit '71d4ce1c228bab470fa9d3bcb5a130cf53665103' into glitch-soc/merge-upstream 2025-06-13 18:07:59 +02:00
github-actions[bot]
5ce055759f New Crowdin Translations (automated) (#35030) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-13 08:20:19 +00:00
Claire
80af1ea434 Merge commit '825312d4b0587c0da5575f8eaabe038438746cd3' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict because of different theming system.
  Adapted upstream's changes.
- `vite.config.mts`:
  Conflict because of different theming system.
  Adapted upstream's changes.
 2025-06-12 20:32:25 +02:00
David Roetzel
319fbbbfac Experimental Async Refreshes API (#34918) 2025-06-12 14:54:00 +00:00
Echo
825312d4b0 Fix theme name requirement regression with efficient lookup by name (#35007) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-06-12 14:09:45 +00:00
Claire
86a7a1ef3b Merge commit '3aed93711c0118ab68fa09f4d3ac2635cb3344b8' into glitch-soc/merge-upstream 2025-06-11 22:52:21 +02:00
Claire
aa6d1d4ac1 Merge commit '629bb74451242060298c6fb305c5337002379cc2' into glitch-soc/merge-upstream 2025-06-11 18:55:03 +02:00
David Roetzel
1623d54ec0 Start local prometheus_exporter server only in puma/sidekiq startup (#35005) 2025-06-11 13:37:59 +00:00
github-actions[bot]
c3022fe10f New Crowdin Translations (automated) (#34973) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-10 07:52:52 +00:00
Claire
e557769a3c Remove broken link to /start/share in welcome e-mail (#34962) 2025-06-08 13:58:53 +00:00
Claire
2085b0b53a Merge commit '520974e05211e988b0447f7f29e88798b1794bcf' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/rest/status_serializer.rb`:
  Not a real conflict, just glitch-soc code textually adjacent to code added
  upstream.
 2025-06-05 18:02:40 +02:00
Matt Jankowski
1297ad759e Update rubocop to version 1.76.0 (#34926) 2025-06-05 12:09:05 +00:00
github-actions[bot]
250c3b0c1f New Crowdin Translations (automated) (#34939) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-05 07:05:25 +00:00
Claire
23ce6d326c Merge commit '129e72b91494f30777cf4fa8a0905de2dccedba7' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream removed OTel instrumentation around some code modified in glitch-soc
  because of the Markdown rendering feature.
  Removed the OTel instrumentation as upstream did.
 2025-06-03 18:34:37 +02:00
Matt Jankowski
6d12831686 Fix Rails/OutputSafety cop from rubocop todo via inline disable (#34893) 2025-06-03 08:00:50 +00:00
Claire
06b1f8bd85 Merge commit '8224178e8ca9746f97ce341179d2c636fa22a082' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream added a condition where glitch-soc had changes on the same line.
  Adapted upstream's changes.
 2025-06-02 20:05:43 +02:00
Claire
8224178e8c Revert "Remove cookie rotator (#32289)" (#34892) 2025-06-02 13:51:27 +00:00
Claire
088af860b3 Merge commit '9c80b16401e7606cbd7eb2bf3af32c18953d1d3f' into glitch-soc/merge-upstream 2025-06-02 12:16:06 +02:00
github-actions[bot]
eb42425427 New Crowdin Translations (automated) (#34874) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-06-02 08:24:52 +00:00
Matt Jankowski
0d5123199f Fix Style/FormatStringToken cop (#34861) 2025-06-02 07:37:33 +00:00
Claire
c2989e231d Merge commit '44d71d59efd79ee723a1dec72ec77833560c45cf' into glitch-soc/merge-upstream 2025-05-31 15:30:19 +02:00
Claire
c00e27aa55 Merge commit '54ad57ea9527a58ac2b95159ed178ed7c737a89c' into glitch-soc/merge-upstream 2025-05-30 17:41:31 +02:00
Matt Jankowski
7efe20337c Fix Style/FetchEnvVar cop in omniauth config (#34862) 2025-05-30 15:32:47 +00:00
Matt Jankowski
c025824f98 Use config_for for cache buster values (#34851) 2025-05-30 11:54:25 +00:00
github-actions[bot]
4130d9659c New Crowdin Translations (automated) (#34847) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-30 07:34:17 +00:00
Matt Jankowski
3c09fd3f89 Fix Style/FetchEnvVar cop in devise config (#34846) 2025-05-30 07:00:37 +00:00
Matt Jankowski
f7a3dd0e38 Use config_for for VAPID key storage (#34845) 2025-05-30 07:00:33 +00:00
Matt Jankowski
a1c260696f Fix Style/FetchEnvVar cop in production env config (#34844) 2025-05-30 07:00:30 +00:00
Claire
b627aee45f Merge commit 'ca41a95872545502dbc6bae6f7237ee20acc38ee' into glitch-soc/merge-upstream 
Conflicts:
- `spec/helpers/theme_helper_spec.rb`:
  Conflict due to glitch-soc's different theming system.
  Adapted upstream changes to glitch-soc's theming system.
 2025-05-28 18:41:47 +02:00
Matt Jankowski
71d46e26b2 Update rack to version 3 (#34816) 2025-05-28 08:39:17 +00:00
github-actions[bot]
43ccb04548 New Crowdin Translations (automated) (#34834) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-28 08:38:51 +00:00
Claire
086a7016c4 Merge commit 'd78535eab9cefc285c0d7ef88adb125ab1ceb6bd' into glitch-soc/merge-upstream 
Conflicts:
- `vite.config.mts`:
  Upstream moved its theming system to a plug-in, where we had our own.
  Adapted the file as well as our own plugin to adopt the same mechanisms.
 2025-05-27 20:49:19 +02:00
github-actions[bot]
32b5da558e New Crowdin Translations (automated) (#34817) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-27 09:28:32 +00:00
Claire
0372344d33 Move Mastodon theme handling to custom vite plugin (#34808) 
Co-authored-by: Echo <ChaosExAnima@users.noreply.github.com>
 2025-05-27 08:50:48 +00:00
Claire
e8f713ba57 Merge commit '47512fe51867fd30f13e02731a9733fa971e8837' into glitch-soc/merge-upstream 2025-05-26 18:46:50 +02:00
Matt Jankowski
37c82a3003 Update sidekiq to version 7 (#34745) 2025-05-26 15:32:41 +00:00
Claire
b7e967817b Fix unnecessary requirement for deprecated OTP_SECRET environment variable (#34810) 2025-05-26 11:59:54 +00:00
Claire
342290a9e0 Merge commit '198b59ca3ec45cbf6e73f53e1f39c7204d8a70c9' into glitch-soc/merge-upstream 2025-05-26 12:31:26 +02:00
github-actions[bot]
d1d3ff087a New Crowdin Translations (automated) (#34795) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-26 07:41:52 +00:00
Claire
706c8bf1a0 Merge commit 'a13756148d353c7479f68e65a210f6d88d26c785' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/embedded.html.haml`:
  Upstream made a change to javascript tags next to lines changed in glitch-soc
  because of the theming system.
  Added the javascript entrypoint upstream added.
- `app/views/layouts/error.html.haml`:
  Upstream made a change to javascript tags next to lines changed in glitch-soc
  because of the theming system.
  Added the javascript entrypoint upstream added.
 2025-05-25 15:11:58 +02:00
Claire
b031f65670 Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream 2025-05-25 14:51:59 +02:00
Claire
f622686397 Merge commit '90f7b90223ce3212a2bb9746a119bcc9287b3237' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream updated dependencies, including one textually adjacent to a
  glitch-soc-only dependency.
  Updated dependencies as upstream did.
 2025-05-25 14:38:25 +02:00
Claire
f49940db85 Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream 
Too many conflicts to list, because of webpack → vite migration.
 2025-05-25 14:36:51 +02:00
github-actions[bot]
11c8177498 New Crowdin Translations (automated) (#34781) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-23 07:24:21 +00:00