Claire
3628717595
Merge commit '3159f3b2f6ed444d4f247c5e7864e4c41ca285df' into glitch-soc/merge-upstream
2025-04-21 15:47:21 +02:00
Eugen Rochko
c01d219c12
Add --only-mapping option to tootctl search deploy ( #34466 )
2025-04-17 09:09:03 +00:00
Claire
4e6c7fba78
Merge commit '678c8dfeec2c221cf609b924161dc03cebfa41e1' into glitch-soc/merge-upstream
2025-04-10 17:50:04 +02:00
Matt Jankowski
4c2f64907b
Remove deprecated Import model ( #34371 )
2025-04-10 12:49:24 +00:00
Claire
99e3ea232f
Merge commit '5f87ae101c5e0e940e148d493eaac1ce31fe24c1' into glitch-soc/merge-upstream
2025-04-04 20:00:24 +02:00
David Roetzel
e2ef173b82
Refactoring: Move SignatureVerificationError into Mastodon namespace ( #34342 )
2025-04-02 07:54:29 +00:00
Claire
e0406fcf02
Merge commit 'e8270e2807727e1cf6a47a40442b3038c5bca858' into glitch-soc/merge-upstream
...
Conflicts:
- `.eslintrc.js`:
Upstream moved it to `eslint.config.mjs`.
Ported the glitch-soc changes there.
- `yarn.lock`:
Upstream updated dependencies close to glitch-soc-only dependencies.
Ported upstream's changes.
2025-04-01 20:59:34 +02:00
Claire
9686ae7060
Fix static version of animated PNG emojis not being properly extracted ( #34337 )
2025-04-01 08:53:49 +00:00
Claire
9c5c86c947
Merge commit 'c93b2c6809905d24262b5973efe20832f1b04a6d' into glitch-soc/merge-upstream
2025-03-26 18:18:07 +01:00
Claire
c93b2c6809
Add new filter action to blur media ( #34256 )
2025-03-26 07:31:05 +00:00
Claire
f1fa6b3cd0
Merge commit '1960aac90b16fce1ec620ac990aa931efcf04700' into glitch-soc/merge-upstream
2025-03-22 15:41:48 +01:00
David Roetzel
d232fa5b14
Reduce number of metric labels ( #34223 )
2025-03-20 11:49:10 +00:00
Claire
0efa669fe9
Merge commit '2f98134ac69ee840095c9d8389e4b2fff72f20c1' into glitch-soc/merge-upstream
2025-03-15 17:49:32 +01:00
David Roetzel
4a6cf67c46
Add middleware to record queue time ( #34172 )
2025-03-14 13:52:04 +00:00
Claire
e479626110
Merge commit '7866745a6bf21e5187137c321040ed58d37e4331' into glitch-soc/merge-upstream
2025-03-13 15:37:44 +01:00
Claire
7866745a6b
Bump version to v4.3.6 ( #34167 )
2025-03-13 14:27:20 +00:00
Claire
399fbf97de
Merge commit '420ffdfb6259740602d4ce727ed5c60432c776a5' into glitch-soc/merge-upstream
2025-03-11 18:44:32 +01:00
David Roetzel
9041ce3c18
Refactoring: Move rack middleware ( #34140 )
2025-03-11 15:24:06 +00:00
David Roetzel
bedf808e02
Move feature flag test setup into config ( #34124 )
2025-03-11 13:29:17 +00:00
Claire
fb55d09f77
Merge commit 'fb34d9c5909116d586a0187d86ada36ee1234f61' into glitch-soc/merge-upstream
2025-03-10 19:48:45 +01:00
Claire
d489fa36f2
Fix Stoplight errors when using REDIS_NAMESPACE ( #34126 )
2025-03-10 14:27:43 +00:00
Claire
4bea9a0a66
Merge commit '04492e7f934d07f8e89fa9c3d4fe3381f251e8a2' into glitch-soc/merge-upstream
2025-03-07 18:34:27 +01:00
Claire
dbd3e05812
Merge commit 'b57687083f4af178f2e2f43665eb4e49d32a50c2' into glitch-soc/merge-upstream
2025-03-07 17:37:36 +01:00
Claire
04492e7f93
Fix behavior of database schema loading with SKIP_POST_DEPLOYMENT_MIGRATIONS ( #34089 )
2025-03-07 13:41:16 +00:00
Claire
9d5a9123b9
Merge commit 'ce23342d72a7f2ca6f8c35727c86ba54c9c365ca' into glitch-soc/merge-upstream
2025-03-07 13:15:10 +01:00
Damien Erambert
debe6c0545
Add emoji from Twemoji 15.0 to the emoji picker/completion ( #33395 )
2025-03-05 17:05:15 +00:00
David Roetzel
8cf27d0fbb
Add simple feature flag system ( #34038 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2025-03-05 15:41:54 +00:00
Claire
d25de5b757
Bump Mastodon API version for new media deletion methods/parameters ( #34035 )
2025-03-04 14:05:40 +00:00
Claire
d7b9f3a8f6
Merge commit 'cfb473c204cee6be3c995b514dff4ac87ca31503' into glitch-soc/merge-upstream
2025-02-27 16:40:45 +01:00
Claire
cfb473c204
Bump version to v4.4.0-alpha.3 ( #34022 )
2025-02-27 15:32:15 +00:00
Claire
1cdd91d6f1
Merge commit '6b519cfefa93a923b19d0f20c292c7185f8fd5f5' into glitch-soc/merge-upstream
2025-02-27 15:52:20 +01:00
Claire
f5c4022a20
Change HTML sanitization to remove unusable and unused embed tag ( #34021 )
2025-02-27 10:12:58 +00:00
Claire
f3bc50778b
Merge commit 'f1d4be1e7509f795706ff2310c5fc36e0e79bf4d' into glitch-soc/merge-upstream
2025-02-18 20:38:57 +01:00
Matt Jankowski
d75c4bf53e
Update rubocop to version 1.72.2 and use plugins configuration style ( #33946 )
2025-02-18 08:25:41 +00:00
Claire
a417d6f3fc
Merge commit '1cf30717dbe7a0038a645c62f19deef7efc42207' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/precompute_feed_service.rb`:
Upstream added an option to skip half-generated timelines.
We have a conflict because we still maintain upstream's old chronological DM
timelines.
Update our code to apply the same logic to the DM timelines.
2025-02-07 21:21:28 +01:00
Claire
9e164c532f
Add --skip-filled-timeline option to tootctl feed build to skip half-filled feeds ( #33844 )
2025-02-06 09:38:32 +00:00
Claire
353e5f797c
Merge commit '5b291fcbe41564264954618fb1f4086a3be1c600' into glitch-soc/merge-upstream
...
Conflicts:
- `app/validators/poll_options_validator.rb`:
Upstream split `PollValidator` in two, and glitch-soc had local changes to
make the options configurable.
Refactored as upstream did, keeping glitch-soc's configurable limits.
2025-01-28 18:29:46 +01:00
Claire
6646a0a9fa
Fix parameter validation in our custom devise strategies ( #33754 )
2025-01-28 08:21:59 +00:00
Claire
fcc5262f60
Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/system/settings/preferences/appearance_spec.rb`:
Upstream tests for changing themes in there, but glitch-soc has
its own place for that.
Updated upstream's change while skipping the theme test.
2025-01-27 18:19:09 +01:00
Claire
ea743d68f3
Fix error in TwoFactorPamAuthenticatable when handling invalid params ( #33746 )
2025-01-27 16:30:18 +00:00
Claire
19fa4cfcf2
Merge commit '3178acc5cb8415a72b646dbe77be05255d3966f3' into glitch-soc/merge-upstream
2025-01-23 13:38:23 +01:00
Claire
a6fc776c6f
Change mastodon:setup to prevent overwriting already-configured servers ( #33684 )
2025-01-22 15:34:22 +00:00
Claire
08e7c4f3a7
Merge commit '7f866daf637e9303c7b503e0ed29ef8802fcb4c0' into glitch-soc/merge-upstream
2025-01-20 18:06:13 +01:00
Claire
ac59ed39dd
Fix re-encoding of high-framerate VFR videos with FFmpeg 6+ ( #33634 )
2025-01-20 09:22:49 +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
Claire
ab4874ff13
Further harden the warnings against changing encryption secrets ( #33631 )
2025-01-17 10:42:52 +00:00
Christian Schmidt
a3baae0b99
API for updating attribution domains ( #32730 )
2025-01-17 08:18:55 +00:00
Matt Jankowski
a19141441d
Move clear environment portion of mastodon:setup to private method ( #33616 )
2025-01-16 15:45:02 +00:00
Matt Jankowski
69b8a0b9bf
Collect errors in setup rake task ( #33603 )
2025-01-16 14:58:59 +00:00
Claire
ad3bb614f0
Merge commit '0aa9bb8130b77b01f6a08c64b7e93876d892868b' into glitch-soc/merge-upstream
2025-01-16 12:13:56 +01:00
