monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,501 Commits 1 Branch 0 Tags 290 MiB
Commit Graph

4130 Commits

Author SHA1 Message Date
Claire 08e7c4f3a7 Merge commit '7f866daf637e9303c7b503e0ed29ef8802fcb4c0' into glitch-soc/merge-upstream 2025-01-20 18:06:13 +01:00
Eugen Rochko 8962f11578
Add warning when selected and detected language is different in web UI (#33042) 2025-01-20 09:17:13 +00:00
github-actions[bot] 329a9e1ac1
New Crowdin Translations (automated) (#33643) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-20 08:59:23 +00:00
Claire 297eb7c956 Merge commit '4bd969e4bb54297981d385903bf8a4348b394f09' into glitch-soc/merge-upstream 
Conflicts:
- `CONTRIBUTING.md`:
  Upstream modified it while we quote upstream's within an otherwise different file.
  Applied upstream's changes.
 2025-01-18 12:42:17 +01:00
github-actions[bot] 1c23ebd62f
New Crowdin Translations (automated) (#33626) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-17 10:05:41 +00:00
Christian Schmidt a3baae0b99
API for updating attribution domains (#32730) 2025-01-17 08:18:55 +00: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
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
Matt Jankowski 12d9ef6003
Character conversion on TOS template (#33233) 2024-12-10 00:04:59 +00:00
Eugen Rochko 425311e1d9
Change referrer policy to be controlled by header in web UI (#33214) 2024-12-09 22:42:45 +00:00
Eugen Rochko 30aa0df88c
Add terms of service (#33055) 2024-12-09 10:04:46 +00:00
github-actions[bot] 7a2a345c08
New Crowdin Translations (automated) (#33210) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-09 09:20:28 +00:00
Eugen Rochko 796dd57e1b
Change ability to navigate of unconfirmed users (#33209) 2024-12-09 08:31:56 +00:00
Eugen Rochko ca45f896dd
Fix various visual sign-up flow issues (#33206) 2024-12-09 08:23:19 +00:00
Matt Jankowski 58c40caeb4
Extract SPA-handled routes to stand-alone file (#33190) 2024-12-07 07:46:34 +00:00
github-actions[bot] 8dc7f8533d
New Crowdin Translations (automated) (#33193) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-06 15:44:21 +00:00
github-actions[bot] 8b223f3b15
New Crowdin Translations (automated) (#33185) 
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-05 09:37:49 +00:00
github-actions[bot] 0262310c88
New Crowdin Translations (automated) (#33166) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-04 10:04:02 +00:00
Matt Jankowski 6fddf1610c
Fix awkwardly-worded nature of scheduled too soon error (#33156) 2024-12-04 07:43:29 +00:00
github-actions[bot] 836810e88b
New Crowdin Translations (automated) (#33146) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-03 09:44:20 +00:00
Michael Stanclift 04b7046be1
Provide option to force use of system scrollbar styling (#32117) 2024-12-03 08:38:23 +00:00
Claire c2817c7fad Merge commit '752d49eefef48262d501ba5fc2006d2c8466a000' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/feed_manager.rb`:
  Upstream changed how notifications from follow subscriptions were handled,
  refactoring this file in the process.
  Conflict is due to glitch-soc having an extra timeline type (direct).
  Ported upstream's changes.
- `app/workers/feed_insert_worker.rb`:
  Ditto.
 2024-12-02 21:08:15 +01:00
github-actions[bot] 4b80ff92bd
New Crowdin Translations (automated) (#33114) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-02 08:27:19 +00:00
Claire 7d52d5df0f Merge commit 'c58967c3bd7b7eee0b284ee2b77a48ed9ce6863e' into glitch-soc/merge-upstream 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Conflict due to upstream adding fallback support for MathML Core while
  glitch-soc supported slightly more tags than upstream.
  Added the MathML Core fallback code to glitch-soc.
- `spec/lib/sanitize/config_spec.rb`:
  Ditto.
 2024-12-01 18:22:00 +01:00
Claire 48827e1210 Merge commit 'a27bafa59653328a0f06bedb1dfb2b6ee92af43d' into glitch-soc/merge-upstream 
- `app/controllers/application_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `spec/helpers/application_helper_spec.rb`:
  Minor conflict due to glitch-soc's theming system.
 2024-12-01 17:36:49 +01:00
github-actions[bot] 9296d58024
New Crowdin Translations (automated) (#33104) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-29 09:39:52 +00:00
Eugen Rochko 48f3ed738f
Fix list error messages (#33082) 2024-11-28 10:13:06 +00:00
github-actions[bot] fa3577e04b
New Crowdin Translations (automated) (#33084) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-28 10:10:38 +00:00
github-actions[bot] 6b1dd1bf2a
New Crowdin Translations (automated) (#33074) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-26 07:24:28 +00:00
github-actions[bot] 4521390163
New Crowdin Translations (automated) (#33043) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-25 08:17:41 +00:00
Matt Jankowski a20dca7327
Restore stdout logging setting in development environment (#33057) 2024-11-24 20:00:37 +00:00
Claire f740611820 Merge commit 'd0753ec276502ea28a1e853cbc6487020a0602e3' into glitch-soc/merge-upstream 2024-11-24 18:56:15 +01:00
github-actions[bot] 497dfbd95c
New Crowdin Translations (automated) (#2896) 
* 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-11-24 18:39:20 +01:00
Claire 6374937147 Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream added a date restriction to trendable posts, while glitch-soc had
  slightly different conditions.
  Added the date restriction to glitch-soc's conditions.
 2024-11-24 16:46:28 +01:00
github-actions[bot] 47190087f8
New Crowdin Translations (automated) (#33020) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-22 08:44:09 +00:00
Matt Jankowski be2d4615ab
Rely on Rails to enable YJIT when available (#33017) 2024-11-22 08:31:23 +00:00
Emelia Smith 4517e18b79
Update dependency doorkeeper to v5.8.0 (#33000) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-11-21 13:48:30 +00:00
github-actions[bot] e4d5cc0ca6
New Crowdin Translations (automated) (#33010) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-21 10:58:45 +00:00
github-actions[bot] 4252b13a4b
New Crowdin Translations (automated) (#32990) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-20 08:24:50 +00:00
github-actions[bot] 9fc2fc2251
New Crowdin Translations (automated) (#32969) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-19 09:05:39 +00:00
Shlee 06fcee099a
DB Replica database_tasks as ENV (#32908) 2024-11-19 08:54:28 +00:00
Matt Jankowski c0c34d35e2
Move self destruct check to `config_for` and add constant for verifier string (#32943) 2024-11-18 09:57:16 +00:00
github-actions[bot] 02985aae69
New Crowdin Translations (automated) (#32927) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-18 09:20:37 +00:00
Renaud Chaput bcf5d30e01
Add OpenTelemetry VCS attributes (#32904) 2024-11-18 08:41:09 +00:00
Claire 4f1242964b Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream 2024-11-15 18:44:32 +01:00
github-actions[bot] c546aa57cb
New Crowdin Translations (automated) (#32900) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-15 10:30:11 +00:00
Emelia Smith ddfb3d123b
Improve display of statuses in admin panel (#30813) 2024-11-15 09:38:01 +00:00
github-actions[bot] aaebf142aa
New Crowdin Translations (automated) (#32884) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-14 09:39:33 +00:00
Jaz-Michael King 03ecf5df3b
Adds a range of reserved usernames to reduce potential misuse by malicious actors (#32828) 2024-11-13 13:10:01 +00:00
github-actions[bot] baad795384
New Crowdin Translations (automated) (#32868) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-13 09:33:02 +00:00
Matt Jankowski ace4268308
Remove unused `api/v1/polls#create` route (#32860) 2024-11-12 17:27:23 +00:00
Claire f5f6273d2b
Move `ALLOWED_PRIVATE_ADDRESSES` parsing to an initializer (#32850) 2024-11-12 13:00:52 +00:00
github-actions[bot] 0d06d70d11
New Crowdin Translations (automated) (#32811) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-12 08:47:59 +00:00
Emelia Smith a34edc211f
Add audit logging to Relays (#32819) 2024-11-12 08:35:08 +00:00
Matt Jankowski c099797700
Use `mastodon` config namespace to load software update default value via `config_for` (#30534) 2024-11-12 08:28:31 +00:00