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
3f8f06eb46
Add support for Active Record query log tags ( #33342 )
2024-12-18 10:05:00 +00:00
1712543c68
Revert "Support animated PNGs in media attachments ( #28516 )" ( #33334 )
2024-12-17 10:52:59 +00:00
a70ae28644
Support animated PNGs in media attachments ( #28516 )
2024-12-11 02:28:21 +00:00
425311e1d9
Change referrer policy to be controlled by header in web UI ( #33214 )
2024-12-09 22:42:45 +00:00
342055cb15
Update `rubocop` to version 1.69.1 ( #32967 )
2024-12-09 14:52:49 +00:00
1ee149d015
Add explicit migration breakpoints ( #33089 )
2024-12-05 11:40:30 +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
c58967c3bd
Add `tootctl feeds vacuum` ( #33065 )
2024-11-29 14:08:57 +00:00
7f4858b339
Correctly sanitize MathML out of post content ( #27107 )
2024-11-28 12:02:34 +00:00
2d8fed23e6
Fix `TagFollow` records not being correctly handled in account operations ( #33063 )
2024-11-25 10:27:58 +00: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
9d34146aaa
Remove redundant temporary index creation in `tootctl status remove` ( #33023 )
2024-11-22 14:19:11 +00:00
35683ac154
Remove webauthn credentials on `tootctl accounts modify --disable-2fa` ( #29883 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-11-22 10:04:48 +00:00
3e44dca0b4
Change dependency from annotate to annotaterb ( #30232 )
2024-11-18 14:40:02 +00:00
c0c34d35e2
Move self destruct check to `config_for` and add constant for verifier string ( #32943 )
2024-11-18 09:57:16 +00:00
911d7dbbf6
Fix `min_id` and `max_id` causing error in search API ( #32857 )
2024-11-18 09:37:01 +00:00
bcf5d30e01
Add OpenTelemetry VCS attributes ( #32904 )
2024-11-18 08:41:09 +00:00
4f1242964b
Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream
2024-11-15 18:44:32 +01:00
f1ef7b5b43
Fix uploading higher-than-wide GIF profile picture with libvips enabled ( #32911 )
2024-11-15 15:35:30 +00:00
62d65504f6
Add `DomainResource` class to wrap MX lookup/normalize ( #32864 )
2024-11-14 13:47:29 +00:00
a6d829e86f
Fix error in CLI EmailDomainBlocks when supplying `--with-dns-records` ( #32863 )
2024-11-13 08:39:58 +00:00
f0f807cec7
Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream
2024-11-10 13:18:43 +01:00
bde0f1239a
Add `InetContainer` with scopes of `containing` and `contained` ( #32802 )
2024-11-08 10:08:36 +00:00
41227aeb95
Update Rails to version 7.2.2 ( #30391 )
2024-11-07 14:58:20 +00:00
697947116e
Add `EmailDomainBlock.parents` scope ( #31968 )
2024-11-07 13:46:20 +00:00
e0a44b8317
Use `shell.indent` for list output indentation in CLI area ( #31969 )
2024-11-07 10:34:13 +00:00
68b545ef33
Add `Status.not_direct_visibility` scope ( #32065 )
2024-11-07 10:32:33 +00:00
befb44a08c
Fix “uninitialized constant HttpLog” errors in tootctl ( #32796 )
2024-11-07 09:57:42 +00:00
dfccd207bb
Refactor common checks in `tootctl media remove-orphans` ( #32720 )
2024-11-04 09:04:55 +00:00
f624ef2778
Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/formatting_helper.rb`:
Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
Wrapped the modified code.
2024-11-03 20:51:58 +01:00
b231c3c1bf
Drop support for ruby 3.1 ( #32363 )
2024-10-31 15:12:08 +00:00
4d9b4ef72f
Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream
2024-10-14 19:46:52 +02:00
ffa1032381
Add further warnings about encryption secrets ( #32476 )
2024-10-14 13:00:20 +00:00
bb0cf04d71
Add note about not changing ActiveRecord encryption secrets once they are set ( #32413 )
2024-10-11 09:19:48 +00:00
258dce1256
Add `OpenSSL::SSL::SSLError` to http connection errors wrapper ( #32307 )
2024-10-08 14:59:51 +00:00
e8ec6667bd
Extract wrapper constant for `HTTP::*` error classes ( #32285 )
2024-10-08 13:53:35 +00:00
3cf2d35c49
Reference `IpBlock.severities` keys from CLI option check ( #32291 )
2024-10-08 13:23:30 +00:00
b28ce2424c
Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream added a helper where glitch-soc had its own, not really
a conflict.
Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream renamed a constant that was used slightly differently in glitch-soc.
Renamed it as upstream did.
2024-10-06 16:07:58 +02:00
cf28104317
Rename preloaded models constant in cli media ( #30531 )
2024-10-04 08:30:08 +00:00
82e7d53d54
Rename transformer constant in sanitizer ( #30532 )
2024-10-04 08:29:23 +00:00
52afa94f1c
Use `print_table` to wrap storage output CLI ( #32230 )
2024-10-03 12:13:54 +00:00
c5f0da98e4
Add detection and download of material_symbol icons in config/navigation.rb ( #31366 )
2024-10-01 12:49:04 +00:00
497e8d00b9
Bump `main` version 4.4.0-alpha.1 ( #32180 )
2024-10-01 08:36:22 +00:00
9af9ef6fb3
Merge commit '03210085b7481568cc507f088144aaf1dae73c88' into glitch-soc/merge-upstream
2024-09-30 13:04:19 +02:00
03210085b7
Bump version to 4.3.0-rc.1 ( #32124 )
2024-09-30 10:42:59 +00:00
7ef25ae53b
Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream
2024-09-29 11:06:09 +02:00
886baa5e35
Fix typo causing incorrect error being raised in blurhash processing failure ( #32104 )
2024-09-26 07:40:59 +00:00
6de18bb475
Merge commit '3e91c101b3c4b5166dab778837e38bed424b4333' into glitch-soc/merge-upstream
2024-09-17 17:54:00 +02:00
Claire