2237 Commits

Author	SHA1	Message	Date
Claire	c04f2d0cf7	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/settings/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc had a different lambda due to its theming system. Applied the same code style changes. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc removed some code just after the lambda. Applied the same code style changes.	2023-07-17 19:02:23 +02:00
Daniel M Brasil	19208aa422	Migrate to request specs in /api/v1/statuses/:status_id/favourite (#25626)	2023-07-17 16:53:57 +02:00
Daniel M Brasil	6fb4a756ff	Migrate to request specs in /api/v1/statuses/:status_id/bookmark (#25624)	2023-07-17 16:51:49 +02:00
Daniel M Brasil	4859958a0c	Migrate to request specs in /api/v1/polls (#25596)	2023-07-17 16:50:00 +02:00
Daniel M Brasil	1aea938d3d	Migrate to request specs in /api/v1/statuses/:status_id/pin (#25635)	2023-07-17 16:24:05 +02:00
Daniel M Brasil	6cdc8408a9	Migrate to request specs in /api/v1/emails/confirmations (#25686)	2023-07-17 16:22:33 +02:00
Daniel M Brasil	8a1aabaac1	Migrate to request specs in /api/v1/timelines/home (#25743)	2023-07-17 16:20:11 +02:00
Claire	943f27f437	Remove unfollowed hashtag posts from home feed (#26028)	2023-07-17 13:56:28 +02:00
Claire	f18618d7f9	Fix some incorrect tests (#26035)	2023-07-17 13:13:43 +02:00
Claire	d9adda1a99	Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream	2023-07-13 22:40:15 +02:00
Claire	41f65edb21	Fix embed dropdown menu item for unauthenticated users (#25964)	2023-07-13 15:53:03 +02:00
Claire	9ae60f8738	Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream ... Conflicts: - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream ran a lint fix on this file, but this file is different in glitch-soc because the feature was added much earlier. Ran the lint fix on our own version of the file.	2023-07-12 16:03:05 +02:00
Claire	075887e1d6	Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream	2023-07-12 15:44:33 +02:00
Claire	dd0002e1fe	Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream ... Conflicts: - `app/models/trends.rb`: Conflict due to glitch-soc's code splitting trends mailing depending on type. Ported upstream's changes.	2023-07-12 15:38:35 +02:00
Claire	82eebd0482	Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream ... Conflicts: - `app/serializers/initial_state_serializer.rb`: Upstream renamed an initial state parameter, where we had extra ones. Renamed as upstream did. - `app/workers/feed_insert_worker.rb`: Upstream wrapped database query in a block, we had extra database queries because of the DM timeline. Moved everything in the block.	2023-07-12 15:27:32 +02:00
Matt Jankowski	6c5a2233a8	Fix RSpec/StubbedMock cop (#25552) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-07-12 10:20:10 +02:00
Matt Jankowski	658742b3cd	Fix Lint/AmbiguousBlockAssociation cop (#25921)	2023-07-12 10:02:41 +02:00
Matt Jankowski	74806deb2c	Fix RSpec/SubjectStub cop (#25550) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-07-12 10:02:19 +02:00
Matt Jankowski	7824df0eca	Exclude lib/linter from simplecov report (#25916)	2023-07-12 09:51:59 +02:00
Matt Jankowski	c75df62ccc	Fix RSpec/SubjectDeclaration cop (#25312)	2023-07-12 09:49:33 +02:00
Nick Schonning	1d557305d2	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
jsgoldstein	99be47f8b9	Change searching with # to include account index (#25638)	2023-07-10 20:58:13 +02:00
Claire	c27b82a437	Add forward_to_domains parameter to POST /api/v1/reports (#25866)	2023-07-10 18:26:56 +02:00
Matt Jankowski	f3fca78756	Refactor NotificationMailer to use parameterization (#25718)	2023-07-10 03:06:22 +02:00
Matt Jankowski	d6b387a0c4	Remove unused NotificationMailer#digest preview (#25719)	2023-07-08 20:04:21 +02:00
Matt Jankowski	cf33028f35	Admin mailer parameterization (#25759)	2023-07-08 20:03:38 +02:00
Eugen Rochko	93e8a15415	Add forwarding of reported replies to servers being replied to (#25341)	2023-07-08 20:00:02 +02:00
Claire	b9aa228c54	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream attempted something with tags. Kept our version.	2023-07-07 19:59:43 +02:00
Claire	94fbac77e7	Fix processing of media files with unusual names (#25788)	2023-07-07 13:35:22 +02:00
Claire	ff7aae3037	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-06 15:16:34 +02:00
Claire	dc8f1fbd97	Merge pull request from GHSA-9928-3cp5-93fm ... * Fix attachments getting processed despite failing content-type validation * Add a restrictive ImageMagick security policy tailored for Mastodon * Fix misdetection of MP3 files with large cover art * Reject unprocessable audio/video files instead of keeping them unchanged	2023-07-06 15:05:05 +02:00
Claire	5de49e74d4	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-05 12:01:26 +02:00
Daniel M Brasil	383c00819c	Fix /api/v2/search not working with following query param (#25681)	2023-07-03 18:06:57 +02:00
Claire	44e98a2740	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-02 11:49:08 +02:00
Daniel M Brasil	4fe2d7cb59	Fix HTTP 500 in /api/v1/emails/check_confirmation (#25595)	2023-07-02 00:05:44 +02:00
Matt Jankowski	683ba5ecb1	Fix rails rewhere deprecation warning in directories api controller (#25625)	2023-07-01 21:48:16 +02:00
Claire	a209d1e683	Fix ResolveURLService not resolving local URLs for remote content (#25637)	2023-06-29 14:48:54 +02:00
jsgoldstein	4581a528f7	Change account search to match by text when opted-in (#25599) ... Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2023-06-29 13:05:21 +02:00
Claire	80a5c16ae1	Merge branch 'main' into glitch-soc/merge-upstream	2023-06-27 13:15:41 +02:00
Claire	c7c6f02ae6	Fix suspending an already-limited domain (#25603)	2023-06-27 12:32:51 +02:00
Claire	178e151019	Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream ... Conflicts: - `app/models/user_settings.rb`: Upstream added a constraint on a setting textually close to glitch-soc-only settings. Applied upstream's change. - `lib/sanitize_ext/sanitize_config.rb`: Upstream added support for the `translate` attribute on a few elements, where glitch-soc had a different set of allowed elements and attributes. Extended glitch-soc's allowed attributes with `translate` as upstream did. - `spec/validators/status_length_validator_spec.rb`: Upstream refactored to use RSpec's `instance_double` instead of `double`, but glitch-soc had changes to tests due to configurable max toot chars. Applied upstream's changes while keeping tests against configurable max toot chars.	2023-06-25 14:27:38 +02:00
Claire	a5b6f6da80	Change /api/v1/statuses/:id/history to always return at least one item (#25510)	2023-06-22 14:56:14 +02:00
Matt Jankowski	05f9e39b32	Fix RSpec/VerifiedDoubles cop (#25469)	2023-06-22 14:55:22 +02:00
Matt Jankowski	38433ccd0b	Reduce Admin::Reports::Actions spec db activity (#25465)	2023-06-22 14:53:13 +02:00
Claire	602c458ab6	Add finer permission requirements for managing webhooks (#25463)	2023-06-22 14:52:25 +02:00
Matt Jankowski	63d15d5330	Speed-up on StatusesController spec (#25549)	2023-06-22 14:51:53 +02:00
Matt Jankowski	0b39b9abee	Speed-up on BackupService spec (#25527)	2023-06-22 11:53:28 +02:00
Daniel M Brasil	6ac271c2a0	Migrate to request specs in /api/v1/suggestions (#25540)	2023-06-22 11:49:35 +02:00
Claire	37a9c2258a	Add per-test timeouts to AutoStatusesCleanupScheduler tests (#24841)	2023-06-20 18:54:05 +02:00
Claire	ebfeaebedb	Fix /api/v1/conversations sometimes returning empty accounts (#25499)	2023-06-20 18:32:26 +02:00