2410 commits

Author	SHA1	Message	Date
Claire	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
Matt Jankowski	abd2f5654a	Add validation coverage for CustomEmoji shortcode value (#31906)	2024-09-16 07:53:03 +00:00
Claire	4b40d13cb3	Increase preview card image size limit from 2MB to 8MB when using libvips (#31904)	2024-09-14 00:16:02 +00:00
Claire	117ac13d12	Merge commit '5ba3405be4c1f708f198580b481f822698dab392' into glitch-soc/merge-upstream	2024-09-13 21:37:34 +02:00
David Roetzel	c1b2c4fd9a	Strip protocol from attribution domains (#31900)	2024-09-13 11:37:15 +00:00
Claire	ba81e4e019	Fix inability to locally suspend remotely-suspended accounts in moderation interface (#31899)	2024-09-13 09:11:10 +00:00
Matt Jankowski	a2c4f5f5c0	Add coverage for ListAccount follow/follow_request set up (#31896)	2024-09-13 08:49:03 +00:00
Matt Jankowski	49cbee3836	Remove unused argument from AccountMigration.within_cooldown (#31892)	2024-09-13 08:43:21 +00:00
Claire	83b553c7d1	Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream	2024-09-12 21:32:39 +02:00
Christian Schmidt	8cdc148167	Handle invalid visibility (#31571)	2024-09-12 13:29:55 +00:00
Matt Jankowski	17c57c46e7	Add coverage for title/limit validations in List model (#31869)	2024-09-12 13:25:23 +00:00
Claire	10e2b87774	Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream	2024-09-12 12:09:21 +02:00
Claire	b240bad61a	Merge commit '5260233b81c301cf7b0c79b179858748b693460b' into glitch-soc/merge-upstream	2024-09-11 20:58:35 +02:00
Matt Jankowski	da07adfe6c	Add CustomEmoji.enabled scope (#31830)	2024-09-10 13:21:40 +00:00
Eugen Rochko	e0c27a5047	Add ability to manage which websites can credit you in link previews (#31819)	2024-09-10 12:00:40 +00:00
Matt Jankowski	5b995143f1	Use with_options for shared Account validation option value (#31827)	2024-09-10 08:03:45 +00:00
Matt Jankowski	d0ab94c4d2	Add FeaturedTag coverage, use pick in model (#31828)	2024-09-09 19:57:19 +00:00
Claire	441af2632d	Merge commit '2caa3f365ded73be17b623177967110e66f14061' into glitch-soc/merge-upstream	2024-09-09 18:22:41 +02:00
Matt Jankowski	e6969cf4e4	Add method for media-referencing status in AccountStatusCleanupPolicy (#31798)	2024-09-09 08:33:51 +00:00
Mike Dalessio	82161d8ae5	Change Account::Field parsing to use HTML5::DocumentFragment (#31813)	2024-09-08 18:56:18 +00:00
Claire	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
Emelia Smith	c88ba523ee	Fix sort order of moderation notes on Reports and Accounts (#31528)	2024-09-06 14:58:36 +00:00
Emelia Smith	fd7fc7bdc3	Disable actions on reports that have already been taken (#31773)	2024-09-06 12:50:30 +00:00
Matt Jankowski	be77a1098b	Extract Account::AUTOMATED_ACTOR_TYPES for "bot" actor_type values (#31772)	2024-09-06 07:49:38 +00:00
Claire	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
Matt Jankowski	58df00f04d	Extract method for self-referencing records in AccountStatusCleanupPolicy (#31244)	2024-09-04 08:52:37 +00:00
Claire	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
Matt Jankowski	7c26e5e4a1	Add Reviewable model concern (#31152)	2024-09-03 15:37:45 +00:00
Matt Jankowski	2f0d0fc127	Add coverage for CLI::Accounts#fix_duplications task (#30639)	2024-09-03 15:36:59 +00:00
Claire	ac4002fe08	Merge commit '611533cd12059d365ca0267342b750e615637bd4' into glitch-soc/merge-upstream	2024-09-03 12:12:23 +02:00
Matt Jankowski	48379e62e4	Remove unused User#inactive_message method (#31698)	2024-09-03 08:04:00 +00:00
Matt Jankowski	406b8211f5	Remove unused Mention#active? method (#31697)	2024-09-03 08:03:25 +00:00
Claire	402c1e116d	Merge commit '491033c86cc9c29302bfe68cc94dabad82ded4cc' into glitch-soc/merge-upstream	2024-09-02 17:43:10 +02:00
David Roetzel	388d5473e1	Refactor (ruby) redis configuration (#31694)	2024-09-02 14:19:55 +00:00
Claire	a23b3747ac	Fix N+1s in grouped notifications (#31638)	2024-09-02 09:56:00 +00:00
Claire	6f35e93f72	Merge commit '02633d6ebbe944a8769c8f2229fa9e0d6c7d1142' into glitch-soc/merge-upstream	2024-08-31 16:06:04 +02:00
Claire	ad0a28a8bf	Add grouped_types parameter to allow clients to restrict which notifications types get grouped (#31594)	2024-08-29 12:39:07 +00:00
Claire	f5c0c32edd	Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/material-icons/400-24px/chat.svg`: Glitch-soc used this one but not upstream. Upstream pulled a presumably more up-to-date version of the file. Switched to upstream's version. - `app/views/layouts/application.html.haml`: Upstream removed use of font-awesome. I hope we are ready. - `app/views/layouts/embedded.html.haml`: Upstream removed use of font-awesome. I hope we are ready. - `app/views/layouts/error.html.haml`: Upstream removed use of font-awesome. I hope we are ready.	2024-08-20 18:31:50 +02:00
Claire	711e1fce0a	Fix pagination parameters in GET /api/v2_alpha/notificatins (#31509)	2024-08-20 13:54:08 +00:00
Claire	1760f84349	Merge commit '53c183f899b5382f1eebd72e34a090c30f8eba6a' into glitch-soc/merge-upstream	2024-08-19 18:25:31 +02:00
Edward Moulsdale	d4f135bc6d	Fix in memoriam accounts appearing in follow recommendations (#31474) ... Co-authored-by: Utkarsh Wankar <46633523+kernal053@users.noreply.github.com>	2024-08-19 15:55:42 +00:00
Emelia Smith	99051479c1	Fix Trending Tags pending review having an unstable sort order (#31473) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-08-19 13:25:40 +00:00
Claire	169b35869f	Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream	2024-08-14 21:17:43 +02:00
Jeong Arm	95c11d365d	Don't push to cache buster if attachment path is nil (#31414)	2024-08-14 08:57:42 +00:00
Matt Jankowski	02df1b4e4a	Finish email allow/deny list naming migration (#30530)	2024-08-13 07:37:32 +00:00
Claire	31a00c0c1a	Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream	2024-08-09 17:15:32 +02:00
Claire	cbdd8edf68	Revamp notification policy options (#31343)	2024-08-09 13:30:55 +00:00
Claire	994ef16b72	Bust CDN cache on media deletion (#31353)	2024-08-09 12:48:34 +00:00
Claire	06e034db15	Merge commit '670e4655d13975e0597bd1c74ebeeeeffc4edc37' into glitch-soc/merge-upstream	2024-08-07 19:22:25 +02:00
Claire	af2aec1a82	Change notification requests to only count mentions (#31322)	2024-08-07 11:12:36 +00:00
Claire	654187a995	Merge commit '1229d2907a4a7ee09ee42cd24043d74561507e0a' into glitch-soc/merge-upstream	2024-07-29 19:16:58 +02:00
Emelia Smith	c40e481169	Implement UI for Admin Search of Hashtags (#30880)	2024-07-29 15:49:44 +00:00
Claire	cf5d2c3fe4	Merge commit '887e64efd4abbf3980e008c7a5441b44fbd6c766' into glitch-soc/merge-upstream	2024-07-25 17:47:02 +02:00
Adam Niedzielski	337a7fcf30	Fix ß bug in regexp for mentions and tags (#31122)	2024-07-25 14:24:19 +00:00
Matt Jankowski	e881a59671	Add User.unconfirmed scope, reduce factories in scheduler/user_cleanup spec (#31063)	2024-07-25 14:18:24 +00:00
Claire	c94c5da7b4	Merge commit '4d374cf73096be1e5347e131c91c99842e3c6dbb' into glitch-soc/merge-upstream	2024-07-25 12:43:25 +02:00
Claire	3a49687ca0	Fix performance issue by using LATERAL in group notification CTE (#31123)	2024-07-24 18:59:15 +00:00
Claire	68000956f4	Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream	2024-07-23 19:31:23 +02:00
Emelia Smith	bb2e5a4b58	Add audit logs to Admin::InstancesController (#27386)	2024-07-23 08:12:30 +00:00
Claire	2aac73341a	Merge commit '80d9bff6df137afc3376f47b62d10a2e3e9456e2' into glitch-soc/merge-upstream ... Conflicts: - `app/services/backup_service.rb`: Conflict due to glitch-soc's local-only posts. Ported upstream's changes while keeping glitch-soc's feature.	2024-07-22 17:38:30 +02:00
Claire	2774980589	Fix syntax error in grouped notifications CTE on some PostgreSQL versions (#31098)	2024-07-22 07:37:27 +00:00
Claire	c75fe09e2b	Merge commit '82344342c1c5adb3f6a4b376559db737a9e982b7' into glitch-soc/merge-upstream	2024-07-18 17:56:25 +02:00
Renaud Chaput	f587ff643f	Grouped Notifications UI (#30440) ... Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-07-18 14:36:09 +00:00
Claire	c546757cd1	Merge commit '66430cb25c824cfad0394216d8e7a523533bcf4b' into glitch-soc/merge-upstream	2024-07-16 17:54:36 +02:00
Emelia Smith	aa88aca0ad	Add optional OAuth application to reports (#30539)	2024-07-16 13:23:08 +00:00
Claire	edec2e9fdf	Merge commit '00cb4a0313190bfa118966692a649db9c8328094' into glitch-soc/merge-upstream	2024-07-14 18:43:35 +02:00
David Roetzel	35a437a03f	Destroy NotificationRequests that are dismissed (#31008)	2024-07-12 12:09:52 +00:00
Claire	55cf5e0188	Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream	2024-07-12 13:41:54 +02:00
Claire	ad52b04a1c	Add setting to disable hover cards (#30931) ... Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2024-07-11 19:42:58 +00:00
Claire	388672ff0d	Merge commit '967505ee9bcacf0e5189aa06c654ff586c198a46' into glitch-soc/merge-upstream	2024-07-09 20:39:09 +02:00
David Roetzel	967505ee9b	Add size limit for all PreviewCard URLs (#30973)	2024-07-09 13:11:34 +00:00
Claire	6a55232988	Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream	2024-07-08 19:41:14 +02:00
Claire	d41b43ed4f	Limit attachments to MEDIA_ATTACHMENTS_LIMIT when returning posts through the API (#30932)	2024-07-08 07:41:50 +00:00
Claire	d2aea85e6c	Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream	2024-06-30 11:25:40 +02:00
Eugen Rochko	096057b845	Change author_account to be authors in REST API (#30846)	2024-06-27 13:17:18 +00:00
Claire	7a84b76bb1	Drop favicon.ico generation (#30375)	2024-06-26 13:44:08 +00:00
Claire	21ca03581a	Merge commit '6527d5039141fe4a80645147b581d76952a64f39' into glitch-soc/merge-upstream	2024-06-24 19:39:42 +02:00
Claire	8827cd597e	Fix /admin/accounts/:account_id/statuses/:id for edited posts with media attachments (#30819)	2024-06-24 13:11:10 +00:00
Claire	fd867adffe	Merge commit 'bb2d77b4a07e95e7d96df080f2d6994c1422b0c0' into glitch-soc/merge-upstream	2024-06-20 18:36:13 +02:00
Claire	bb2d77b4a0	Change /api/v2_alpha/notifications to only return historical data in pages (#30781)	2024-06-20 15:54:50 +00:00
Claire	f723370c69	Fix missing account_warning delegation in NotificationGroup (#30779)	2024-06-20 13:44:49 +00:00
Claire	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
Claire	677f73f793	Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream	2024-06-17 13:41:58 +02:00
Claire	8eb27c60e1	Add most_recent_notification_id to NotificationGroup (#30707)	2024-06-14 10:33:06 +00:00
Claire	37f53542fe	Fix limit handling in grouped notifications CTE (#30685)	2024-06-13 12:42:40 +00:00
Claire	4daed855e5	Merge commit 'd818ddd6870094e89e58ef61f37da4cb73935856' into glitch-soc/merge-upstream	2024-06-11 19:46:11 +02:00
Matt Jankowski	d818ddd687	Extract SIGN_COUNT_LIMIT constant in WebauthnCredential class (#30636)	2024-06-11 15:36:21 +00:00
Matt Jankowski	665f6f09a0	Add expired/revoked scopes for doorkeeper models via extension modules (#29936)	2024-06-11 08:50:51 +00:00
Claire	be68f8f4af	Merge commit '9cc4040308a758d4b77961f4da79cf63a044fffe' into glitch-soc/merge-upstream	2024-06-10 18:20:08 +02:00
Matt Jankowski	9bf2e2eda0	Extract TEXT_LENGTH_LIMIT constant in Appeal class (#30638)	2024-06-10 15:23:17 +00:00
Claire	7277d2f130	Merge commit '496c10542bd39ca86a85d4de81778c134ea4383c' into glitch-soc/merge-upstream	2024-06-07 20:30:51 +02:00
Claire	9e9613b286	Fix mentions.account_id and mentions.status_id not having NOT NULL database constraints (#30591)	2024-06-07 13:45:11 +00:00
Claire	1408733386	Fix Mastodon relying on ImageMagick even with MASTODON_USE_LIBVIPS (#30590)	2024-06-07 09:27:59 +00:00
Claire	30b00ca2b5	Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream	2024-06-06 12:27:26 +02:00
Eugen Rochko	a2505e8611	Add timeline of public posts about a trending link to REST API (#30381)	2024-06-06 08:43:04 +00:00
Emelia Smith	4655be0da6	Fix add validation to webpush subscription keys (#30542)	2024-06-05 19:16:47 +00:00
Eugen Rochko	5f15a892fa	Add support for libvips in addition to ImageMagick (#30090) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-06-05 19:15:39 +00:00
Emelia Smith	eef2cc054f	Add url validation to Web::PushSubscription endpoints (#30540)	2024-06-05 08:06:06 +00:00
Claire	974335e414	Add experimental server-side notification grouping (#29889)	2024-06-03 08:35:59 +00:00
Claire	c827a98f19	Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream ... Conflicts: - `yarn.lock`: Not a real conflict, just a line adjacent to a glitch-soc only dependency getting updated. Updated dependencies as upstream did.	2024-05-29 17:03:24 +02:00