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
3e91c101b3
Bump version to 4.3.0-beta.2 ( #31948 )
2024-09-17 15:42:45 +00:00
665e9129fe
Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/custom_emoji.rb`:
An upstream refactor touched lines adjacent to ones modified in glitch-soc.
Ported upstream's changes.
2024-09-16 21:08:58 +02:00
e0648a916a
Rename `/api/v2_alpha/notifications*` to `/api/v2/notifications*` ( #31840 )
2024-09-16 12:10:02 +00:00
83b553c7d1
Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream
2024-09-12 21:32:39 +02:00
1b6a82b799
Fix invalid date searches returning 503 ( #31526 )
2024-09-12 13:40:20 +00:00
10e2b87774
Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream
2024-09-12 12:09:21 +02:00
c4b09d684e
Extract method for account-referencing in CLI prune task ( #31824 )
2024-09-10 13:23:55 +00:00
441af2632d
Merge commit '2caa3f365ded73be17b623177967110e66f14061' into glitch-soc/merge-upstream
2024-09-09 18:22:41 +02:00
10143d053a
Change some instances of Nokogiri HTML4 parsing to HTML5 ( #31812 )
2024-09-08 18:41:37 +00:00
29124990a2
Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream reworked how CSS classes for the document's body are computed.
Slight conflict due to glitch-soc's different theming system.
Updated as upstream did.
2024-09-06 19:25:31 +02:00
be77a1098b
Extract `Account::AUTOMATED_ACTOR_TYPES` for "bot" actor_type values ( #31772 )
2024-09-06 07:49:38 +00:00
1a0ef0c526
Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream
2024-09-05 20:36:25 +02:00
f85694acfd
Add credentials to redis sentinel configuration ( #31768 )
2024-09-05 14:06:58 +00:00
7d91723f05
Support `REDIS_SENTINEL_PORT` variables ( #31767 )
2024-09-05 09:26:49 +00:00
5a55180b95
Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
Upstream rewrote top-level `describe` calls to `RSpec.describe`, and
glitch-soc had differences in the first few tests because of the wider
subset of HTML it accepts.
Changed `describe` to `RSpec.describe` as upstream did, keeping
glitch-soc's tests.
2024-09-04 19:38:52 +02:00
ef2bc8ea26
Add redis sentinel support to ruby part of code ( #31744 )
2024-09-04 14:10:45 +00:00
fef055db96
Merge commit 'c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/requests/api/v1/timelines/tag_spec.rb`:
Upstream refactored this file, while we had a change to switch a default setting.
Updated as upstream did.
- `spec/views/statuses/show.html.haml_spec.rb`:
Upstream refactored this file, while we stubbed different methods.
Updated as upstream did, and updated the stubs accordingly.
2024-09-03 21:51:53 +02:00
2f0d0fc127
Add coverage for `CLI::Accounts#fix_duplications` task ( #30639 )
2024-09-03 15:36:59 +00:00
402c1e116d
Merge commit '491033c86cc9c29302bfe68cc94dabad82ded4cc' into glitch-soc/merge-upstream
2024-09-02 17:43:10 +02:00
388d5473e1
Refactor (ruby) redis configuration ( #31694 )
2024-09-02 14:19:55 +00:00
6f35e93f72
Merge commit '02633d6ebbe944a8769c8f2229fa9e0d6c7d1142' into glitch-soc/merge-upstream
2024-08-31 16:06:04 +02:00
85e8d1f285
Use rails configuration storage for paperclip path ( #31651 )
2024-08-30 09:46:09 +00:00
11b8017b45
Merge commit 'e38ce3beb7b83f43ef6e6f144c19b186c393910c' into glitch-soc/merge-upstream
2024-08-26 18:52:33 +02:00
bcc4b1078c
Fix `Rails/RootPathnameMethods` cop ( #31582 )
2024-08-26 07:35:07 +00:00
d0529b810a
Merge commit '97f6baf977212e84125ac325176ad305ad5b068a' into glitch-soc/merge-upstream
2024-08-24 12:06:31 +02:00
97f6baf977
Bump version to v4.3.0-beta.1 ( #30989 )
2024-08-23 16:07:32 +00:00
c493689e84
Change output format of `repo:changelog` task ( #31546 )
2024-08-23 12:55:54 +00:00
83480df820
Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added `<s>` to the list of allowed tags, the conflict is because
we have a different list of allowed tags.
Added `<s>` like upstream did.
2024-08-12 17:46:24 +02:00
709dcd07f2
Add support for incoming <s> tag ( #31375 )
2024-08-12 11:10:05 +00:00
31a00c0c1a
Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream
2024-08-09 17:15:32 +02:00
cbdd8edf68
Revamp notification policy options ( #31343 )
2024-08-09 13:30:55 +00:00
08adca0c63
Merge commit 'c8b9e60ec123c458efff83eedcfd07f067ef05ae' into glitch-soc/merge-upstream
2024-08-06 17:27:48 +02:00
9d0cafd06b
Check Content-Length in ResponseWithLimitAdapter ( #31285 )
2024-08-06 08:23:48 +00:00
8dd671a977
Merge commit 'a50c8e951f03a8eb53957ad1c3703155b223ed24' into glitch-soc/merge-upstream
2024-07-31 18:16:01 +02:00
4eab6aef95
Change User-Agent to use Mastodon as the product, and http.rb as platform details ( #31192 )
2024-07-30 21:40:42 +00:00
68000956f4
Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream
2024-07-23 19:31:23 +02:00
1b839d2cba
Fix `mastodon:stats` decoration of stats rake task ( #31104 )
2024-07-23 06:51:57 +00:00
e61a7794f8
Merge commit 'df9e26158d9787859b24bdc276af478abf05e1af' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Conflict because glitch-soc has a different list of allowed tags.
Added upstream's new allowed tags while keeping ours.
- `spec/requests/api/v1/timelines/public_spec.rb`:
Conflict because of glitch-soc's default settings.
Updated accordingly.
2024-07-04 17:12:14 +02:00
df9e26158d
Bump version to v4.3.0-alpha.5 ( #30920 )
2024-07-04 14:59:54 +00:00
47f0faebc9
Implement HTML ruby tags for east-asian languages ( #30897 )
2024-07-03 20:05:59 +00:00
d2aea85e6c
Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream
2024-06-30 11:25:40 +02:00
ba6a558a70
Simplify color extraction code using `bandunfold` ( #30869 )
2024-06-28 22:41:27 +00:00
7a84b76bb1
Drop favicon.ico generation ( #30375 )
2024-06-26 13:44:08 +00:00
cabd7c21fc
Merge commit '2cda1dd542b20a47245cb8d28a4f6f8750c2284c' into glitch-soc/merge-upstream
2024-06-19 19:37:37 +02:00
2cda1dd542
Fix compatibility with Redis < 6.2 again ( #30412 )
2024-06-19 16:59:37 +00:00
395b9011ee
Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Not a real conflict, just upstream adding a method textually adjacent to
glitch-soc only code.
Ported upstream's change.
2024-06-17 18:30:28 +02:00
d5f02adad7
Add option to use native Ruby driver for Redis ( #30717 )
2024-06-17 12:28:01 +00:00
4daed855e5
Merge commit 'd818ddd6870094e89e58ef61f37da4cb73935856' into glitch-soc/merge-upstream
2024-06-11 19:46:11 +02:00
328d3a87f5
Fix libvips color extraction when multiple maxima differ only on blue component ( #30632 )
2024-06-11 13:58:10 +00:00
7277d2f130
Merge commit '496c10542bd39ca86a85d4de81778c134ea4383c' into glitch-soc/merge-upstream
2024-06-07 20:30:51 +02:00
82be5d033f
Improve handling of libvips failures ( #30597 )
2024-06-07 15:39:41 +00:00
37e4d96b70
Restore `verbose` option to media remove cli ( #30536 )
2024-06-07 12:39:53 +00:00
Claire
Christian Schmidt
Eugen Rochko
Matt Jankowski
Calvin Lee
シュンジョーァ
Andrew W. Lee
Renaud Chaput
Emelia Smith
Taylor Chaparro
Mike Dalessio
David Roetzel
Django
Michael Stanclift