89 Commits

Author	SHA1	Message	Date
Claire	077e0c6812	Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Conflict caused by the `json` gem thing once again. Updated as upstream did, but keeping the most recent `json` version. - `spec/helpers/application_helper_spec.rb`: Upstream refactored a bunch of specs, including one place that differs because of glitch-soc's theming system. Refactored as upstream did, adapting it for glitch-soc's theming system.	2023-12-20 22:16:50 +01:00
Claire	b135b6ba8f	Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/custom_emojis/new.html.haml`: Conflict caused by glitch-soc having a different file size limit constant name. Updated like upstream did while keeping glitch-soc's constant name.	2023-12-19 21:24:01 +01:00
Claire	6c00d5b0c4	Fix test failure caused by glitch-soc changes	2023-12-19 21:14:39 +01:00
Claire	2e786e13cb	Merge commit '973597c6f1e25b16c592e5573304319aeaa375e1' into glitch-soc/merge-upstream ... Conflicts: - `app/validators/status_pin_validator.rb`: Upstream refactored that file, while glitch-soc had configurable limits for pinned statuses. Updated the code with upstream's refactor, while keeping glitch-soc's configurability.	2023-12-19 20:51:37 +01:00
Claire	d288a6162a	Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream	2023-12-19 20:40:05 +01:00
Claire	b24f676cf1	Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream	2023-12-19 20:24:57 +01:00
Claire	a111fd7a0b	Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream	2023-12-18 20:47:27 +01:00
Claire	b474cbbd28	Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/accounts/relationships_controller.rb`: We differed by listing suspended users when requesting relationships. Updated to upstream's code.	2023-12-18 18:40:58 +01:00
Claire	4113fbf6e8	Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream ... Conflicts: - `lib/sanitize_ext/sanitize_config.rb`: Upstream enforced new code style rules, where we had different code. Applied the new code style rules.	2023-12-17 23:04:16 +01:00
Claire	9f92b05bd2	Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream has updated their README but we have a completely different one. Kept our version of `README.md`	2023-12-10 18:05:02 +01:00
Matt Jankowski	71e5a16eba	Remove triple subject call in api/v1/lists spec (#28210)	2023-12-04 15:28:19 +00:00
Matt Jankowski	cca19f5fbb	Use the Admin::ActionLog fabricator in admin/action_logs spec (#28194)	2023-12-04 12:56:28 +00:00
Kevin Bongart	7877fcd83c	Deduplicate IDs in relationships and familiar_followers APIs (#27982)	2023-11-23 10:00:09 +00:00
Matt Jankowski	973597c6f1	Consolidate configuration of Sidekiq::Testing.fake! setup (#28046)	2023-11-23 09:43:43 +00:00
Matt Jankowski	30ee4aaff4	Convert measurement api/v1/admin/* controller specs to request specs (#28005)	2023-11-21 14:25:07 +00:00
Matt Jankowski	32e19e3af6	Reduce .times usage in request and controller specs (#27949)	2023-11-21 13:05:59 +00:00
Matt Jankowski	876f5b1d12	Convert /instances/* controller specs to request specs (#27988) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-11-20 11:05:28 +00:00
Matt Jankowski	718c95e7af	Convert api/v1/custom_emojis controller spec to request spec (#27985) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-11-20 11:05:24 +00:00
Matt Jankowski	17582d36d5	Convert api/v1/preferences controller spec to request spec (#27987)	2023-11-20 09:39:45 +00:00
Matt Jankowski	9a01a260a0	Convert api/v1/scheduled_statuses controller spec to request spec (#27986)	2023-11-20 09:36:49 +00:00
Matt Jankowski	b9fb47aeb1	Convert api/v1/endorsements controller spec to request spec (#27984)	2023-11-20 09:32:28 +00:00
Claire	297839c10c	Rewrite /api/v1/statuses tests as request specs (#27891)	2023-11-17 11:36:04 +00:00
Claire	9257737675	Rewrite /api/v1/accounts tests as request specs (#27888)	2023-11-17 11:34:49 +00:00
Matt Jankowski	549e8e7baf	Add email_spec and speedup/cleanup to spec/mailers (#27902)	2023-11-17 09:50:19 +00:00
Matt Jankowski	3f0c1566c3	Reduce expectations for RSpec/MultipleExpectations cop in api/v1/accounts/relationships spec (#27879)	2023-11-16 09:55:50 +00:00
Matt Jankowski	d562fb8459	Specs for minimal CSP policy in Api:: controllers (#27845)	2023-11-14 14:34:30 +00:00
Matt Jankowski	5e2ecc736d	Remove double subject in api/v1/accounts/relationships spec (#27839)	2023-11-14 10:29:33 +00:00
Claire	c451bbe249	Allow viewing and severing relationships with suspended accounts (#27667)	2023-11-09 14:50:25 +00:00
Matt Jankowski	949f5eb860	Fix RSpec/MetadataStyle cop in spec/ (#27729)	2023-11-06 14:28:20 +00:00
Claire	bbf46cc418	Fix error and incorrect URLs in /api/v1/accounts/:id/featured_tags for remote accounts (#27459)	2023-10-27 08:35:21 +00:00
Claire	e25cc4deb7	Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream ... Conflicts: - `config/navigation.rb`: Conflict due to glitch-soc having extra navigation items for its theming system. Ported upstream changes.	2023-10-24 19:31:14 +02:00
Daniel M Brasil	26d2a2a0cc	Migrate to request specs in /api/v1/media (#25543)	2023-10-23 15:46:21 +00:00
Claire	74fd46d3ab	Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream	2023-10-19 19:14:04 +02:00
Emelia Smith	7c3fea7275	Feature: Allow token introspection without read scope (#27142)	2023-10-18 14:10:07 +02:00
Claire	c10a667ac2	Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream	2023-10-17 21:42:49 +02:00
Claire	b867d4581e	Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream ... Conflicts: - `spec/controllers/api/v1/timelines/tag_controller_spec.rb`: Glitch-soc had a few extra lines in this file to account for a different default setting. This file got replaced by `spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc additions were moved too. Additional changes: - `spec/requests/api/v1/statuses/sources_spec.rb`: Add glitch-soc-only attribute `content_type`.	2023-10-17 21:35:07 +02:00
Daniel M Brasil	e0ed0f8c7c	Migrate to request specs in /api/v1/notifications (#25553)	2023-10-16 17:15:24 +02:00
Daniel M Brasil	cafdaec6cf	Migrate to request specs in /api/v1/lists/:id/accounts (#25468)	2023-10-16 16:03:48 +02:00
Daniel M Brasil	8e6116503d	Migrate to request specs in /api/v1/blocks (#25517)	2023-10-16 16:03:35 +02:00
Daniel M Brasil	d9caa6ed24	Migrate to request specs in /api/v1/admin/accounts (#25563)	2023-10-16 15:49:12 +02:00
Daniel M Brasil	82beeb2f7e	Migrate to request specs in /api/v1/admin/trends/links (#25739)	2023-10-13 16:23:16 +02:00
Claire	71cfdd7865	Fix duplicate tests (#27395)	2023-10-13 16:10:43 +02:00
Daniel M Brasil	058f73a4f5	Add request specs for /api/v1/reports (#25475)	2023-10-13 15:30:40 +02:00
Daniel M Brasil	bc6cd27d9e	Migrate to request specs in /api/v1/followed_tags (#25472)	2023-10-13 14:43:50 +02:00
Matt Jankowski	fd9dea21d0	DB speedup in API:: controller/request specs (#25516)	2023-10-13 14:42:09 +02:00
Daniel M Brasil	ecdb31d479	Migrate to request specs in /api/v1/favourites (#25518)	2023-10-13 14:19:12 +02:00
Daniel M Brasil	7664e3b692	Migrate to request specs in /api/v1/statuses/:status_id/source (#25634)	2023-10-13 14:08:21 +02:00
Daniel M Brasil	4230d1ee0a	Migrate to request specs in /api/v1/timelines/tag/:hashtag (#25797)	2023-10-13 14:04:37 +02:00
Claire	f05985f8ec	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream changed their README, we have a completely different one. Kept our version.	2023-09-21 15:12:00 +02:00
Claire	828eebad48	Add hide_collections, discoverable and indexable attributes to credentials API (#26998)	2023-09-20 18:25:16 +02:00