tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,225 Commits 5 Branches 0 Tags
Commit Graph

4276 Commits

Author SHA1 Message Date
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
David Roetzel
a5a2c6dc7e
Add support for FASP data sharing (#34415) 2025-05-16 12:24:02 +00:00
github-actions[bot]
c058c45a8e
New Crowdin Translations (automated) (#34701) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-16 08:07:14 +00:00
Claire
0fda1f0e94 Merge commit '6c743831aab13a39f2020827f20933a51bc7cbc2' into glitch-soc/merge-upstream 2025-05-15 18:52:02 +02:00
github-actions[bot]
e17c78b679
New Crowdin Translations (automated) (#34695) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-15 08:50:48 +00:00
Claire
5321a553d5 Merge commit 'aa04efb92a47cf27c1aafb2aeb21584e91c526ac' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Not a real conflict, upstream added a setting on a line adjacent to a
  glitch-soc-only line.
  Added upstream's new setting.
 2025-05-14 13:38:23 +02:00
Claire
aa04efb92a
Move server rule creation form to its own page (#34637) 2025-05-14 09:43:07 +00:00
github-actions[bot]
8d5b73d70d
New Crowdin Translations (automated) (#34679) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-14 07:00:32 +00:00
Claire
5305e939c4
Add (currently unused) setting for default quote policy (#34623) 2025-05-13 11:47:38 +00:00
Claire
f993d7578b
Use plural forms for date_of_birth prompt (#34636) 2025-05-13 11:29:22 +00:00
github-actions[bot]
65baf9b04a
New Crowdin Translations (automated) (#34672) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-13 07:47:56 +00:00
Claire
5ec840a32f
Change REDIS_NAMESPACE deprecation warning to an error (#34664) 2025-05-12 15:14:15 +00:00
github-actions[bot]
3357ae9889
New Crowdin Translations (automated) (#34655) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-12 07:40:14 +00:00
Claire
a5a3a781e0 Merge commit '82688387a8d19906371a6dd4af64e5b662031603' into glitch-soc/merge-upstream 2025-05-09 18:16:46 +02:00
github-actions[bot]
7cd7445abe
New Crowdin Translations (automated) (#34649) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-05-09 07:07:17 +00:00
Claire
5cade30257 Merge commit '8c579c5b34b94a9ca59f91d24ec23366f4d21137' into glitch-soc/merge-upstream 
Conflicts:
- `jest.config.js`
- `package.json`
- `tsconfig.json`
 2025-05-08 15:47:40 +02:00