3112 commits

Author	SHA1	Message	Date
Emelia Smith	30ae5952d2	Fix: Ensure "With Media" is highlighted from Admin Accounts page (#30812)	2024-06-25 07:46:53 +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	3b4607991d	Merge commit '4743657ba24e83c376e9f477fbf49114e6f09a57' into glitch-soc/merge-upstream	2024-06-22 20:59:23 +02:00
Jeremy Kescher	b3f731abac	Merge branch 'refs/heads/glitch-soc' into develop	2024-06-22 13:30:26 +02:00
Matt Jankowski	72484a194f	Remove CacheBuster default options (#30718)	2024-06-21 15:32:49 +00:00
David Roetzel	2cab1c7b09	Improve encoding detection for link cards (#30780)	2024-06-21 12:51:10 +00:00
Claire	cabd7c21fc	Merge commit '2cda1dd542b20a47245cb8d28a4f6f8750c2284c' into glitch-soc/merge-upstream	2024-06-19 19:37:37 +02:00
Jeremy Kescher	5e5f19b50e	Merge branch 'refs/heads/glitch' into develop	2024-06-19 17:49:06 +02:00
Jeremy Kescher	3f2e2c0923	Merge branch 'refs/heads/glitch' into develop	2024-06-19 17:20:56 +02:00
Matt Jankowski	84a31319e9	Add match_json_values and use in AP worker specs (#30720)	2024-06-19 13:46:52 +00:00
Claire	52e34a6bd6	Merge commit '5f4d231e980665c0946297909df508269fb25dc6' into glitch-soc/merge-upstream	2024-06-19 11:59:06 +02:00
Claire	8098d27f84	Stop calling Webpacker in full-stack tests (#30763)	2024-06-19 09:31:30 +00:00
Claire	b0c979af49	Merge commit '58ace2e45e16a69977267d03874568c11043f04c' into glitch-soc/merge-upstream	2024-06-18 18:20:36 +02:00
Claire	58ace2e45e	Fix SQL error in admin measures API (#30753)	2024-06-18 16:04:58 +00:00
Matt Jankowski	38c6825eda	Remove unused Extractor#extract_cashtags_with_indices method (#30742)	2024-06-18 12:16:16 +00:00
Jeremy Kescher	29ac8c0606	Merge branch 'refs/heads/glitch-soc' into develop	2024-06-18 00:15:52 +02:00
Jeremy Kescher	895b479c23	Merge branch 'refs/heads/glitch-soc' into develop	2024-06-17 22:52:08 +02: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
Matt Jankowski	d7b7617321	Use class_names in admin/account_moderation_notes helper (#30719)	2024-06-17 12:20:57 +00:00
Claire	677f73f793	Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream	2024-06-17 13:41:58 +02:00
Matt Jankowski	f287462f76	Fix repeated Delete/Undo assertion in remove status service spec (#30715)	2024-06-17 10:21:29 +00:00
Jeremy Kescher	209f90f670	Merge branch 'refs/heads/glitch-soc' into develop	2024-06-16 05:32:45 +02:00
Claire	45abddb302	Fix pagination attributes not being returned in ungroupable-only pages (#30688)	2024-06-13 14:10:34 +00:00
Claire	bf56e982a9	Fix notifications from limited users being outright dropped (#30559)	2024-06-12 13:50:38 +00:00
Claire	1dfd516284	Fix duplicate @context attribute in user export (#30653)	2024-06-12 07:28:28 +00:00
Claire	f214813919	Adapt settings spec to glitch-soc	2024-06-11 19:54:27 +02: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	62d070c438	Check both before/after state in AccountDomainBlock spec (#30640)	2024-06-11 13:59:56 +00:00
Matt Jankowski	1622f7aeb9	Remove duplicate fabricator validity checks (#29667)	2024-06-11 07:48:42 +00:00
Matt Jankowski	edf6d64eeb	Use correct params in settings/preferences/appearance spec (#30379)	2024-06-11 07:36:46 +00:00
Matt Jankowski	b2496177e0	Use correct params in v1/admin/domain_allows spec (#30378)	2024-06-11 07:35:30 +00:00
Matt Jankowski	cfd4823b65	Use fabricator in follow_spec (#30642)	2024-06-11 06:57:09 +00:00
Claire	be68f8f4af	Merge commit '9cc4040308a758d4b77961f4da79cf63a044fffe' into glitch-soc/merge-upstream	2024-06-10 18:20:08 +02:00
Matt Jankowski	9cc4040308	Extract COMMENT_SIZE_LIMIT constant in AP::Activity::Flag class (#30637)	2024-06-10 15:23:55 +00:00
Matt Jankowski	9bf2e2eda0	Extract TEXT_LENGTH_LIMIT constant in Appeal class (#30638)	2024-06-10 15:23:17 +00:00
Matt Jankowski	3e3f3d7580	Match report validation spec to extracted constant (#30633)	2024-06-10 15:04:01 +00:00
Matt Jankowski	92b3004bf3	Reference constants from account validation specs (#30634)	2024-06-10 15:03:41 +00:00
Daniel M Brasil	28f9a8f2ec	Add Specs for Scheduled Status Model Validations (#30585)	2024-06-10 14:52:33 +00:00
Daniel M Brasil	77c2216e47	fix: Return HTTP 422 when scheduled status time is less than 5 minutes (#30584)	2024-06-10 13:33:48 +00:00
Matt Jankowski	827e36ff9e	Fix Capybara/NegationMatcher cop in spec/system (#30616)	2024-06-08 17:10:06 +00:00
Claire	7277d2f130	Merge commit '496c10542bd39ca86a85d4de81778c134ea4383c' into glitch-soc/merge-upstream	2024-06-07 20:30:51 +02:00
Claire	1408733386	Fix Mastodon relying on ImageMagick even with MASTODON_USE_LIBVIPS (#30590)	2024-06-07 09:27:59 +00:00
Matt Jankowski	04ebbe3077	Add sidekiq_inline to appeal service spec (#30562)	2024-06-06 14:19:37 +00:00
Matt Jankowski	07cc94e05f	Use sidekiq_inline in requests/api/v1/admin/account_actions spec (#30563)	2024-06-06 14:19:22 +00:00
Matt Jankowski	9b9b0e25b6	Use sidekiq_inline in requests/api/v1/reports spec (#30564)	2024-06-06 14:14:33 +00:00
Matt Jankowski	a662c6d1d8	Use sidekiq_inline in admin/account_action model spec (#30565)	2024-06-06 14:12:58 +00:00
Claire	578b0eae7d	Fix /api/v1/timelines/link specs for glitch-soc default settings	2024-06-06 12:52:15 +02: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	e02d23b549	Change read:me scope to profile scope (#30357) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-06-06 07:30:10 +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
Matt Jankowski	249cbc449c	Use existing config access to local_domain value (#30509)	2024-06-03 09:15:58 +00:00
Claire	974335e414	Add experimental server-side notification grouping (#29889)	2024-06-03 08:35:59 +00:00
Matt Jankowski	4d047b95ae	Use more direct attribute handling in User fabricator (#30495)	2024-05-31 09:54:11 +00:00
Jeremy Kescher	cb080ca3ef	Bump version to v4.3.0-alpha.4+glitch+cat+1.0.0	2024-05-30 18:51:42 +02:00
Claire	b8271f20c5	Merge commit '7f808ff6e9148f1cfe1e16d000e2405b6e31f243' into glitch-soc/merge-upstream	2024-05-30 15:41:31 +02:00
Claire	16249946ae	Merge pull request from GHSA-q3rg-xx5v-4mxh	2024-05-30 14:14:04 +02:00
Claire	3ea4275ae3	Merge pull request from GHSA-5fq7-3p3j-9vrf	2024-05-30 14:03:13 +02: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
Emelia Smith	d20a5c3ec9	Fix: remove broken OAuth Application vacuuming & throttle OAuth Application registrations (#30316) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-05-29 14:00:05 +00:00
Jeremy Kescher	6d448d46ff	Merge branch 'refs/heads/glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/actions/interactions.js # app/javascript/flavours/glitch/reducers/statuses.js	2024-05-29 14:23:08 +02:00
Claire	36fe8f8566	Change ids param to id in /api/v1/statuses and /api/v1/accounts for consistency (#30465)	2024-05-29 09:19:17 +00:00
Matt Jankowski	c61e356475	Add Status::MEDIA_ATTACHMENTS_LIMIT configuration constant (#30433)	2024-05-27 09:49:44 +00:00
Matt Jankowski	564ebfefcf	Remove hard reference from status pin validator spec (#30432)	2024-05-27 09:20:28 +00:00
Claire	51631c785f	Merge commit 'b6fd14f0e2842eca269ef8962e3c5bd560a76357' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/activitypub/parser/status_parser.rb`: Glitch-soc had changes to adjacent lines. Ported upstream's changes.	2024-05-23 20:30:23 +02:00
Claire	0e8633f6c7	Merge commit '3a862439dfc989c6c5741e007c2f4e0335fffe33' into glitch-soc/merge-upstream	2024-05-23 20:11:12 +02:00
Claire	133d98fb25	Normalize language code of incoming posts (#30403)	2024-05-23 17:28:18 +00:00
Matt Jankowski	3a862439df	Remove unused account record in api/v2/admin/accounts spec (#30397)	2024-05-23 08:26:58 +00:00
Jeremy Kescher	d1856ea48d	Merge branch 'refs/heads/glitch-soc' into develop ... # Conflicts: # app/javascript/mastodon/initial_state.js	2024-05-22 23:56:46 +02:00
Claire	5ab111554e	Merge commit 'cd0c5479362260082dbe1cbc42e364017853bbfc' into glitch-soc/merge-upstream	2024-05-21 17:45:21 +02:00
Claire	32223863a5	Add coverage to /admin/accounts/:id (#30386)	2024-05-21 13:17:34 +00:00
Claire	d3136e6d58	Merge commit '89f89d738f5840c80ff938f8bf6734cdafe0fa83' into glitch-soc/merge-upstream	2024-05-21 12:06:38 +02:00
Claire	89f89d738f	Revert "Allow unblocking email addresses from any matching account (#29305)" (#30385)	2024-05-21 08:56:08 +00:00
Jeremy Kescher	fae98d1deb	Merge branch 'refs/heads/glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/initial_state.js # app/javascript/mastodon/initial_state.js	2024-05-20 23:57:04 +02:00
Claire	20fdf8e22c	Merge commit '0a2110b9af52005798251dc9d245a66dd5dd20fa' into glitch-soc/merge-upstream	2024-05-20 17:47:48 +02:00
Matt Jankowski	0a2110b9af	Add coverage for custom filters (#30347)	2024-05-20 15:00:09 +00:00
Claire	e46321e63d	Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream	2024-05-20 12:17:36 +02:00
Claire	de4815afda	Add more tests for self-destruct mode (#30374)	2024-05-20 10:06:51 +00:00
Matt Jankowski	def6b686ff	Fix Rails/WhereRange cop (#30343)	2024-05-20 09:37:36 +00:00
Matt Jankowski	70608f824e	Add coverage for AdminMailer#auto_close_registrations (#30349)	2024-05-20 08:03:39 +00:00
Emelia Smith	2da2a1dae9	Support multiple redirect_uris when creating OAuth 2.0 Applications (#29192)	2024-05-17 13:46:12 +00:00
Jeremy Kescher	70c76a1f30	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-17 15:33:30 +02:00
Claire	2810231180	Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Upstream renamed a helper method everywhere. There was one glitch-soc line involving changes because of the local-only post feature. Ported upstream's change.	2024-05-16 19:30:10 +02:00
Matt Jankowski	65e82211cd	Rename cache_* methods to preload_* in controller concern (#30209)	2024-05-16 08:03:46 +00:00
Emelia Smith	5fd56512de	Improve Report Notes and Account Moderation Notes (#30288)	2024-05-15 13:38:36 +00:00
Jason Punyon	85c625d319	Fix repetitive database queries from #30040 (#30259)	2024-05-15 09:38:16 +00:00
Matt Jankowski	6beead3867	Move simplecov config into rails_helper (#30302)	2024-05-15 09:33:36 +00:00
Renaud Chaput	40639510f8	Retain unconfirmed users longer (1 week) (#30285)	2024-05-15 08:27:34 +00:00
Jeremy Kescher	74ed5bf354	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-14 18:56:01 +02:00
Jeremy Kescher	e73c612cb1	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-11 23:31:31 +02:00
Claire	f35ba6963d	Merge commit '1959365c2f410aa82874c5c05ab92c4eca4c4055' into glitch-soc/merge-upstream	2024-05-11 22:10:56 +02:00
Matt Jankowski	0d397db5dd	Consolidate system specs into single directory, use rspec tags for configuration (#30206)	2024-05-10 12:36:09 +00:00
Matt Jankowski	fa43a6c835	Use more accurate redirect_uri in oauth spec (#30212)	2024-05-10 09:43:59 +00:00
Claire	016d194274	Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, upstream added helpers right next to glitch-soc only helpers. Added upstream's helpers. - `spec/models/status_spec.rb`: Not a real conflict, upstream added specs right next to glitch-soc only specs. Added upstream's tests.	2024-05-06 17:53:51 +02:00
Claire	2fe1b8d169	Add API to get multiple accounts and statuses (#27871) ... Co-authored-by: noellabo <noel.yoshiba@gmail.com>	2024-05-06 15:19:15 +00:00
Fawaz Farid	bc24c4792d	Allow admins to configure instance favicon and logo (#30040)	2024-05-06 15:06:52 +00:00