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
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
22813dbc6e
Fix `/health` endpoint when OTEL is configured ( #33362 )
2024-12-19 10:44:44 +00:00
7a08fe91b5
New Crowdin Translations (automated) ( #33358 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-12-19 08:47:20 +00:00
3f8f06eb46
Add support for Active Record query log tags ( #33342 )
2024-12-18 10:05:00 +00:00
1992c2a4fa
New Crowdin Translations (automated) ( #33345 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-12-18 07:51:31 +00:00
3febe7d020
Add OTEL trace & span IDs to logs ( #33339 )
2024-12-18 07:34:20 +00:00
3f9ac22af3
Remove empty/unused `config/storage.yml` file ( #33341 )
2024-12-18 07:25:14 +00:00
1712543c68
Revert "Support animated PNGs in media attachments ( #28516 )" ( #33334 )
2024-12-17 10:52:59 +00:00
02748f172d
New Crowdin Translations (automated) ( #33332 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-12-17 09:33:42 +00:00
504ea31bd3
New Crowdin Translations (automated) ( #33310 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-12-16 07:54:12 +00:00
7200f9d25c
New Crowdin Translations (automated) ( #33300 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-12-13 10:38:09 +00:00
d580607510
don't start OTel traces with Redis spans ( #33090 )
2024-12-13 08:21:38 +00:00
bc5b9d98a5
Remove unused `admin/terms_of_service` routes ( #33288 )
2024-12-12 20:17:15 +00:00
e0a49af47d
New Crowdin Translations (automated) ( #33280 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-12-12 09:10:00 +00:00
f12b3a9cef
New Crowdin Translations (automated) ( #33262 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-12-11 08:20:44 +00:00
a70ae28644
Support animated PNGs in media attachments ( #28516 )
2024-12-11 02:28:21 +00:00
2a369a8977
Use a system setting for the Referer policy ( #33239 )
2024-12-10 13:16:52 +00:00
801cd731be
New Crowdin Translations (automated) ( #33235 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-12-10 09:10:28 +00:00
2131e61548
Fix hard wrap of markdown list in TOS template ( #33230 )
2024-12-10 01:43:03 +00:00
12d9ef6003
Character conversion on TOS template ( #33233 )
2024-12-10 00:04:59 +00:00
425311e1d9
Change referrer policy to be controlled by header in web UI ( #33214 )
2024-12-09 22:42:45 +00:00
30aa0df88c
Add terms of service ( #33055 )
2024-12-09 10:04:46 +00:00
7a2a345c08
New Crowdin Translations (automated) ( #33210 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-12-09 09:20:28 +00:00
796dd57e1b
Change ability to navigate of unconfirmed users ( #33209 )
2024-12-09 08:31:56 +00:00
ca45f896dd
Fix various visual sign-up flow issues ( #33206 )
2024-12-09 08:23:19 +00:00
58c40caeb4
Extract SPA-handled routes to stand-alone file ( #33190 )
2024-12-07 07:46:34 +00:00
8dc7f8533d
New Crowdin Translations (automated) ( #33193 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-12-06 15:44:21 +00:00
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
0262310c88
New Crowdin Translations (automated) ( #33166 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-12-04 10:04:02 +00:00
6fddf1610c
Fix awkwardly-worded nature of scheduled too soon error ( #33156 )
2024-12-04 07:43:29 +00:00
836810e88b
New Crowdin Translations (automated) ( #33146 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-12-03 09:44:20 +00:00
04b7046be1
Provide option to force use of system scrollbar styling ( #32117 )
2024-12-03 08:38:23 +00:00
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
4b80ff92bd
New Crowdin Translations (automated) ( #33114 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-12-02 08:27:19 +00:00
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
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
9296d58024
New Crowdin Translations (automated) ( #33104 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-29 09:39:52 +00:00
48f3ed738f
Fix list error messages ( #33082 )
2024-11-28 10:13:06 +00:00
fa3577e04b
New Crowdin Translations (automated) ( #33084 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-28 10:10:38 +00:00
6b1dd1bf2a
New Crowdin Translations (automated) ( #33074 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-26 07:24:28 +00:00
4521390163
New Crowdin Translations (automated) ( #33043 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-25 08:17:41 +00:00
a20dca7327
Restore stdout logging setting in development environment ( #33057 )
2024-11-24 20:00:37 +00:00
f740611820
Merge commit 'd0753ec276502ea28a1e853cbc6487020a0602e3' into glitch-soc/merge-upstream
2024-11-24 18:56:15 +01:00
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
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
47190087f8
New Crowdin Translations (automated) ( #33020 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-22 08:44:09 +00:00
be2d4615ab
Rely on Rails to enable YJIT when available ( #33017 )
2024-11-22 08:31:23 +00:00
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
e4d5cc0ca6
New Crowdin Translations (automated) ( #33010 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-11-21 10:58:45 +00:00
Claire