Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 16:59:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,289 Commits 74 Branches 58 Tags
7f87ce29961c06d023aa3684cfc939d880fa6d92
Commit Graph

4291 Commits

Author SHA1 Message Date
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
Matt Jankowski
bd2988bdf4 Fix Style/PreferredHashMethods cop (#34775) 2025-05-23 07:11:59 +00:00
David Roetzel
3acd87419c Update to linzer 0.7 (#34765) 2025-05-23 06:43:02 +00:00
github-actions[bot]
cddb69ed52 New Crowdin Translations (automated) (#34762) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-22 10:11:03 +00:00
Matt Jankowski
8d4ae81ab4 Remove OTP_SECRET env configuration (#34748) 2025-05-22 09:33:21 +00:00
Matt Jankowski
f1a6f4333a Remove redis-namespace gem (#34742) 2025-05-21 15:20:17 +00:00
Claire
8c51a8ba94 Add ability to translate server rules (#34494) 2025-05-21 11:54:12 +00:00
Matt Jankowski
67f5122ba6 Use ActiveSupport::TaggedLogging.logger shorthand to set logger in production env (#34746) 2025-05-21 08:50:36 +00:00
github-actions[bot]
07741f307e New Crowdin Translations (automated) (#34750) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-21 08:28:04 +00:00
Claire
f7182ddc8b Change libvips to be enabled by default (#34741) 2025-05-20 17:14:17 +00:00
Claire
dab31f7a88 Drop support for PostgreSQL 12 (#34744) 2025-05-20 14:48:29 +00:00
Matt Jankowski
855022f4d9 Use ActiveSupport::TaggedLogging.logger shorthand to set logger (#34734) 2025-05-20 14:31:49 +00:00
Claire
6d6263ce07 Drop redis namespace code (except for Rails cache) (#34665) 2025-05-20 13:02:09 +00:00
Claire
d7cb6068b1 Add ability to reorder server rules from admin interface (#34737) 2025-05-20 12:49:11 +00:00
github-actions[bot]
8ed0408adb New Crowdin Translations (automated) (#34736) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-20 08:13:20 +00:00
Echo
dbf14784bf Add setting to control the referrer origin (#34731) 2025-05-19 13:13:22 +00:00
github-actions[bot]
e291f95a04 New Crowdin Translations (automated) (#34713) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-19 07:35:35 +00:00
Claire
c327451300 Merge commit 'a5a2c6dc7ec0d8af53594cd53a90da7d6fbefd5a' into glitch-soc/merge-upstream 2025-05-16 17:36:28 +02:00
Claire
8cc5084ca1 Add interstitial for Terms of Service updates (#34527) 2025-05-16 14:03:05 +00:00
Echo
c4f47adb49 Convert from Webpack to Vite (#34450) 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2025-05-16 13:26:12 +00:00