2830 commits

Author	SHA1	Message	Date
Claire	2dc244784c	Merge commit 'cfa71a4d16e71b04a42dda564ed8e188bd1badd9' into glitch-soc/merge-upstream	2024-02-24 15:43:15 +01:00
Claire	1ad91dece8	Merge commit '9d8dfeb5fbbc274482489a3ac9f22dd736da156c' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.jsx`: Changes applied to `app/javascript/core/admin.js` instead.	2024-02-24 15:35:56 +01:00
Claire	7901dc9e24	Merge commit '491dd9764244c8adf37861f00d916c96bdbfdaf8' into glitch-soc/merge-upstream ... Conflicts: - `app/workers/scheduler/auto_close_registrations_scheduler.rb`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version.	2024-02-24 15:33:36 +01:00
Claire	d2cfc6e5e2	Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream	2024-02-24 15:02:28 +01:00
Claire	ef3d15554b	Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. - `README.md`: Upstream updated its README, we have a completely different one. Kept glitch-soc's README. - `app/models/account.rb`: Not a real conflict, upstream updated some lines textually adjacent to glitch-soc-specific lines. Ported upstream's changes.	2024-02-24 14:46:14 +01:00
Claire	ab2f0daa10	Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-security.yml`: Changes were already cherry-picked and adapted in glitch-soc. Kept glitch-soc's version. - `Gemfile.lock`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. - `lib/mastodon/version.rb`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version.	2024-02-24 14:27:43 +01:00
Claire	5b9ddfcfcc	Merge commit 'fa0ba677538588086d83c97c0ea56f9cd1556590' into glitch-soc/merge-upstream	2024-02-24 14:18:16 +01:00
Claire	dfd74f0dae	Merge commit '1467f1e1e1c18dc4b310862ff1f719165a24cfb6' into glitch-soc/merge-upstream	2024-02-24 14:15:49 +01:00
Claire	73de36318e	Move api/v1/timelines/direct to request spec	2024-02-24 14:10:05 +01:00
Claire	9903e6beab	Merge commit '0b0ca6f3b85c9d08e4642e49d743f8d060632293' into glitch-soc/merge-upstream ... Conflicts: - `spec/controllers/api/v1/timelines/direct_controller_spec.rb`: `spec/controllers/api/v1/timelines` has been renamed, but we had an extra spec here for a glitch-soc-only endpoint. Kept glitch-soc's file unchanged (will port to a request spec later).	2024-02-24 14:05:26 +01:00
Claire	c297d999ba	Merge commit '87ad398ddc78f2da5746774960690661e8e57335' into glitch-soc/merge-upstream	2024-02-24 14:02:01 +01:00
Claire	20615a516d	Merge commit '805dba7f8d2a2d5f910ec1396247b36417170345' into glitch-soc/merge-upstream	2024-02-24 13:53:59 +01:00
Matt Jankowski	b0064ddda7	Add basic coverage for MoveService class (#29301)	2024-02-23 09:59:29 +00:00
Claire	9d8dfeb5fb	Fix processing of Link objects in Image objects (#29335)	2024-02-22 22:27:24 +01:00
Matt Jankowski	a6ed148769	Use heredoc on the HTML blocks in verify link spec (#29365)	2024-02-22 21:26:48 +00:00
Claire	10a0d76bf0	Merge commit '6936e5aa693ccc4aabd26ef18a65fbb8132f6f74' into glitch-soc/merge-upstream-composer ... Conflicts: - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream completely redesigned this, and glitch-soc had different handling for the character limit. Ported upstream's change to the new version. - `app/javascript/mastodon/features/compose/components/poll_form.jsx`: Upstream completely redesigned this, and glitch-soc had different limits for option length and number of options. Ported glitch-soc's changes to the new version. Additional change: - `app/javascript/styles/components.scss`: Change how the new image is looked up.	2024-02-22 20:58:41 +01:00
Claire	f25414014a	Fix link verifications when page size exceeds 1MB (#29358)	2024-02-22 20:45:40 +01:00
Claire	d23f445527	Automatically switch from open to approved registrations in absence of moderators (#29318)	2024-02-22 20:45:40 +01:00
Claire	5152dd869e	Fix link verifications when page size exceeds 1MB (#29358)	2024-02-22 17:31:50 +00:00
Claire	b71904816a	Change registrations to be disabled by default for new servers (#29280)	2024-02-22 13:28:19 +00:00
Matt Jankowski	e9b0f0c314	Add basic coverage for RemoveDomainsFromFollowersService class (#29327)	2024-02-22 10:53:38 +00:00
Matt Jankowski	7c7dfe7de3	Add basic coverage for RemoveFeaturedTagService class (#29328)	2024-02-22 10:51:04 +00:00
Matt Jankowski	6342ddd698	Add basic coverage for UnfavouriteService class (#29329)	2024-02-22 10:48:42 +00:00
Matt Jankowski	f70905f127	Add basic coverage for UnmuteService class (#29330)	2024-02-22 10:48:09 +00:00
Matt Jankowski	a69fe534e3	Add basic coverage for WebhookService class (#29331)	2024-02-22 10:46:20 +00:00
Matt Jankowski	d1602c017d	Add basic coverage for ApproveAppealService class (#29333)	2024-02-22 10:40:07 +00:00
Matt Jankowski	ab2ef63a03	Add basic coverage for VoteService class (#29334)	2024-02-22 10:39:18 +00:00
Claire	2751acb6cd	Automatically switch from open to approved registrations in absence of moderators (#29318)	2024-02-21 17:45:06 +00:00
Matt Jankowski	08342ad40c	Add basic coverage for AfterUnallowDomainService class (#29324)	2024-02-21 17:13:11 +00:00
Matt Jankowski	8f61e32569	Add basic coverage for AppealService class (#29322)	2024-02-21 17:12:31 +00:00
Matt Jankowski	b73932461f	Add basic coverage for CreateFeaturedTagService class (#29321)	2024-02-21 16:58:19 +00:00
Matt Jankowski	5f19e7e799	Add basic coverage for ProcessHashtagsService class (#29320)	2024-02-21 16:57:45 +00:00
Matt Jankowski	1f648fdf1a	Remove erroneous service type on TagFeed model spec (#29302)	2024-02-21 11:25:33 +00:00
Matt Jankowski	64f9939e39	Use capture_emails helper to improve email assertions in specs (#29245)	2024-02-19 15:57:47 +00:00
Wolfgang Fournès	86627ea2e4	Add a missing thread example to the statuses spec (#29278)	2024-02-19 13:35:58 +00:00
Matt Jankowski	245064bb98	Move "everyone" role and "instance actor" account magic number IDs to constants (#29260)	2024-02-19 11:09:43 +00:00
Claire	96ddf1d482	Fix flaky end-to-end OCR test (#29244)	2024-02-16 16:57:23 +00:00
Matt Jankowski	1946e171e6	Reduce round trips in admin/disputes/appeals spec (#29234)	2024-02-16 13:46:28 +00:00
Matt Jankowski	3454fcbd71	Reduce round trips in auth/sessions spec (#29233)	2024-02-16 13:38:49 +00:00
Matt Jankowski	a316c0e38d	Reduce round trips in disputes/appeals spec (#29232)	2024-02-16 13:01:15 +00:00
Matt Jankowski	117b507df5	Extract subject from User#mark_email_as_confirmed! spec (#29231)	2024-02-16 13:01:04 +00:00
Matt Jankowski	1690fb39e6	Reduce RSpec/MultipleExpectations in instance_actors_controller spec (#29229)	2024-02-16 13:00:11 +00:00
Matt Jankowski	bba488c189	Reduce RSpec/MultipleExpectations in media_attachment spec (#29228)	2024-02-16 13:00:09 +00:00
Claire	6c1b6194f7	Merge pull request from GHSA-jhrq-qvrm-qr36 ... * Fix insufficient Content-Type checking of fetched ActivityStreams objects * Allow JSON-LD documents with multiple profiles	2024-02-16 12:17:15 +01:00
Claire	9fee5e8526	Merge pull request from GHSA-jhrq-qvrm-qr36 ... * Fix insufficient Content-Type checking of fetched ActivityStreams objects * Allow JSON-LD documents with multiple profiles	2024-02-16 11:56:12 +01:00
Matt Jankowski	a9f9b0097b	Reduce RSpec/MultipleExpectations in captcha feature spec (#29226)	2024-02-16 07:52:57 +00:00
Matt Jankowski	4b7f04e3ea	Reduce RSpec/MultipleExpectations in post_status_service spec (#29225)	2024-02-16 07:52:29 +00:00
Matt Jankowski	ed4939296a	Reduce RSpec/MultipleExpectations in ap/activity/create spec (#29224)	2024-02-16 07:43:00 +00:00
Matt Jankowski	1df2ffc3ee	Use subject in blacklist email validator spec (#29211)	2024-02-16 07:42:03 +00:00
Matt Jankowski	fc4f823464	Avoid local block var assignment in ap/process_status_update_service spec (#29210)	2024-02-16 07:41:25 +00:00
Claire	e7ca82762d	Fix user creation failure handling in OAuth paths (#29207)	2024-02-14 23:12:59 +01:00
Claire	d4d0565b0f	Fix user creation failure handling in OAuth paths (#29207)	2024-02-14 21:49:45 +00:00
Claire	486e4bc7d3	Fix OmniAuth tests (#29201)	2024-02-14 16:07:28 +01:00
Claire	bbbbf00084	Fix OmniAuth tests (#29201)	2024-02-14 14:57:49 +00:00
Claire	53b73ed6a2	Merge pull request from GHSA-vm39-j3vx-pch3 ... * Prevent different identities from a same SSO provider from accessing a same account * Lock auth provider changes behind `ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH=true` * Rename methods to avoid confusion between OAuth and OmniAuth	2024-02-14 15:25:15 +01:00
Emelia Smith	436419cc2f	Merge pull request from GHSA-7w3c-p9j8-mq3x ... * Ensure destruction of OAuth Applications notifies streaming Due to doorkeeper using a dependent: delete_all relationship, the destroy of an OAuth Application bypassed the existing AccessTokenExtension callbacks for announcing destructing of access tokens. * Ensure password resets revoke access to Streaming API * Improve performance of deleting OAuth tokens --------- Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-02-14 15:25:15 +01:00
Claire	b31af34c97	Merge pull request from GHSA-vm39-j3vx-pch3 ... * Prevent different identities from a same SSO provider from accessing a same account * Lock auth provider changes behind `ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH=true` * Rename methods to avoid confusion between OAuth and OmniAuth	2024-02-14 15:16:07 +01:00
Emelia Smith	68eaa804c9	Merge pull request from GHSA-7w3c-p9j8-mq3x ... * Ensure destruction of OAuth Applications notifies streaming Due to doorkeeper using a dependent: delete_all relationship, the destroy of an OAuth Application bypassed the existing AccessTokenExtension callbacks for announcing destructing of access tokens. * Ensure password resets revoke access to Streaming API * Improve performance of deleting OAuth tokens --------- Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-02-14 15:15:34 +01:00
Emelia Smith	eae436c5a8	Disable administrative doorkeeper routes (#29187)	2024-02-13 20:03:00 +01:00
Emelia Smith	46142cdbdd	Disable administrative doorkeeper routes (#29187)	2024-02-13 18:11:47 +00:00
Claire	ca8fbda5d0	Add end-to-end test for OCR in media uploads (#29148)	2024-02-08 19:13:44 +00:00
Matt Jankowski	a9e91eb955	Add common stub setup for resolv dns in email mx validator spec (#29140)	2024-02-08 14:26:45 +00:00
Matt Jankowski	15437e4ad9	Add context and before to lengthy tag manager spec examples (#29129)	2024-02-08 10:03:04 +00:00
Matt Jankowski	5271131658	Extract helper method for repeated form fill in admin/domain_blocks feature spec (#29128)	2024-02-08 10:02:53 +00:00
Claire	eff447a455	Rewrite signature verification using regexps and StringScanner (#29133)	2024-02-07 17:24:42 +00:00
Matt Jankowski	95da28d201	Add common ThreadingHelper module for specs (#29116)	2024-02-07 14:53:29 +00:00
Claire	7efc33b909	Move HTTP Signature parsing code to its own class (#28932)	2024-02-07 13:35:37 +00:00
Matt Jankowski	da50217b88	Combine repeated requests in admin/accounts controller spec (#29119)	2024-02-07 10:59:32 +00:00
Claire	7ee93b7431	Change source attribute of Suggestion entity in /api/v2/suggestions back to a string (#29108)	2024-02-06 17:10:17 +00:00
Matt Jankowski	0df86d77fd	Reduce RSpec/ExampleLength in PostStatusService spec example (#29105)	2024-02-06 14:36:04 +00:00
Matt Jankowski	2d6ab44556	Reduce request/response round-trips in ap/collections controller spec (#29102)	2024-02-06 13:10:00 +00:00
Matt Jankowski	978fdc71ca	Reduce expectation count in example from ProcessAccountService spec (#29100)	2024-02-06 13:04:02 +00:00
Matt Jankowski	577520b637	Replace deprecated Sidekiq::Testing block style (#29097)	2024-02-06 12:49:48 +00:00
Matt Jankowski	df7acdcee5	Update markers API spec for error case (#29096)	2024-02-06 12:47:04 +00:00
Emelia Smith	4fb7f611de	Return domain block digests from admin domain blocks API (#29092)	2024-02-06 12:38:14 +00:00
Matt Jankowski	4cf07ed78c	Add missing action logging to api/v1/admin/reports#update (#29044)	2024-02-06 11:34:11 +00:00
Claire	66dda7c762	Fix already-invalid reports failing to resolve (#29027)	2024-02-06 09:35:27 +00:00
Claire	ff58ec0103	Merge pull request from GHSA-3fjr-858r-92rw ... * Fix insufficient origin validation * Bump version to 4.3.0-alpha.1	2024-02-01 15:57:08 +01:00
Claire	1726085db5	Merge pull request from GHSA-3fjr-858r-92rw ... * Fix insufficient origin validation * Bump version to 4.3.0-alpha.1	2024-02-01 15:56:46 +01:00
Matt Jankowski	f4416e6b3a	Configure selenium to use Chrome version 120 (#29038)	2024-02-01 11:15:23 +01:00
Matt Jankowski	8b7b0ee598	Configure selenium to use Chrome version 120 (#29038)	2024-02-01 09:46:31 +00:00
Matt Jankowski	86fbde7b46	Fix Style/NumericLiterals cop in ProfileStories support module (#28971)	2024-01-30 15:38:33 +00:00
Matt Jankowski	f91acba70a	Combine repeated requests in account controller concern spec (#28957)	2024-01-30 15:32:20 +00:00
Claire	bf153b384b	Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/auth/confirmations_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict. - `app/controllers/auth/passwords_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict. - `app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict.	2024-01-27 19:06:41 +01:00
Claire	5fa2821853	Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream	2024-01-26 20:47:20 +01:00
Matt Jankowski	ff8937aa2c	Move api/v1/statuses/* to request spec (#28954)	2024-01-26 17:45:54 +00:00
Matt Jankowski	44f6d285af	Combine repeated subject in ap fetch remote actor service spec (#28953)	2024-01-26 17:44:12 +00:00
Matt Jankowski	239244e2ed	Combine repeated subject in ap fetch remote account service spec (#28952)	2024-01-26 17:43:08 +00:00
Matt Jankowski	5119fbc9b7	Move api/v1/admin/trends/links/preview_card_providers to request spec (#28951)	2024-01-26 17:41:39 +00:00
Matt Jankowski	b6baab447d	Move api/v2/admin/accounts to request spec (#28950)	2024-01-26 17:41:13 +00:00
Matt Jankowski	7adcc0aae3	Move api/v1/trends/* to request specs (#28949)	2024-01-26 17:40:39 +00:00
Matt Jankowski	0b0ca6f3b8	Move api/v1/timelines/list to request spec (#28948)	2024-01-26 17:40:15 +00:00
Matt Jankowski	e519f113e8	Combine repeated subject in cacheable response shared example (#28945)	2024-01-26 16:37:05 +00:00
Matt Jankowski	d791bca11b	Combine double subject in well_known/webfinger shared example (#28944)	2024-01-26 16:36:21 +00:00
Matt Jankowski	09a3493fca	Combine double subject in api/v1/media shared example (#28943)	2024-01-26 16:35:49 +00:00
Matt Jankowski	5fbdb2055b	Combine repeated subject in cli/accounts spec shared example (#28942)	2024-01-26 16:35:19 +00:00
Matt Jankowski	1a30a517d6	Combine repeated subjects in link details extractor spec (#28941)	2024-01-26 16:31:07 +00:00
Matt Jankowski	685eaa04d4	Combine double subject in admin/statuses controller shared example (#28940)	2024-01-26 16:30:30 +00:00
Matt Jankowski	beb74fd71c	Combine double subjects in instance actors controller shared example (#28939)	2024-01-26 16:28:50 +00:00
Matt Jankowski	beaef4b672	Combine double subjects in application controller shared example (#28938)	2024-01-26 16:23:12 +00:00