929 commits

Author	SHA1	Message	Date
Essem	36e09fbd6d	Merge remote-tracking branch 'upstream/main'	2024-01-02 15:37:44 -06:00
Claire	b3542ac57b	Merge commit '1184887b01' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated its README, we have a completely different one. Kept our README.	2024-01-02 13:35:11 +01:00
Claire	1184887b01	Fix streaming API redirection ignoring the port of streaming_api_base_url (#28558)	2024-01-02 12:27:51 +00:00
Essem	978cd69dd4	Merge remote-tracking branch 'upstream/main'	2023-12-29 12:50:42 -06:00
Claire	c5b0e6d5a0	Merge branch 'main' into glitch-soc/merge-upstream	2023-12-28 16:57:10 +01:00
Essem	8860d937ce	Merge remote-tracking branch 'upstream/main'	2023-12-22 16:07:42 -06:00
Claire	92aa6e2ec9	Merge commit 'b7bdcd4f39' into glitch-soc/merge-upstream	2023-12-21 19:42:13 +01:00
Claire	30ee7339d3	Merge commit '7d9b209fe8' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: Upstream changed code style change, including on a line modified by glitch-soc. Kept glitch-soc's line but with the code style change applied.	2023-12-21 19:31:12 +01:00
Claire	077e0c6812	Merge commit '0b4a3a0437' 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	75580360cd	Merge commit '272592d16d' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: Upstream fixed a bunch lint issues, and changed the `Max` parameter of the `Metrics/AbcSize` cop. Glitch-soc has different code and slightly higher `AbcSize` complexity, modified the `.rubocop_todo.yml` file accordingly. - `app/policies/status_policy.rb`: Upstream changed `account.suspended?` to `account.unavailable?` to prepare for delete flags. Glitch-soc has additional local-only conditions. Ported upstream's refactor while keeping glitch-soc's additional condition. - `app/serializers/initial_state_serializer.rb`: Upstream refactored a bunch of stuff while glitch-soc has more settings. Refactored as upstream did while keeping glitch-soc's settings.	2023-12-20 22:05:31 +01:00
Essem	5fdd18ead1	Merge remote-tracking branch 'upstream/main'	2023-12-20 15:01:05 -06:00
Claire	8a5f2442cc	Merge commit '0530ce5e95' into glitch-soc/merge-upstream	2023-12-20 21:58:18 +01:00
Essem	cc676636f4	Merge remote-tracking branch 'upstream/main'	2023-12-19 15:24:52 -06:00
Claire	b135b6ba8f	Merge commit '8ebc94dd22' 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	2e786e13cb	Merge commit '973597c6f1' 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	3ad92e8d0d	Merge commit 'bd575a1dd6' into glitch-soc/merge-upstream	2023-12-19 20:17:23 +01:00
Claire	cd1e3ac2c7	Merge commit '7e1a77ea51' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/timelines/public_controller.rb`: Upstream refactored this code, the conflict was because of an extra supported parameter, `allow_local_only`. Updated the controller to follow upstream's refactor, and moved the extra parameter definition accordingly.	2023-12-19 19:51:40 +01:00
Eugen Rochko	b5ac61b2c5	Change algorithm of follow recommendations (#28314) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-12-19 10:59:43 +00:00
Matt Jankowski	c28976d89e	Handle negative offset param in api/v2/search (#28282)	2023-12-19 10:55:39 +00:00
Claire	a111fd7a0b	Merge commit 'b2c5b20ef2' into glitch-soc/merge-upstream	2023-12-18 20:47:27 +01:00
Claire	d6ad9d351e	Merge commit 'a36b59be8a' into glitch-soc/merge-upstream	2023-12-18 19:10:43 +01:00
Claire	b474cbbd28	Merge commit '7840c6b75b' 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	7d9b209fe8	Fix call to inefficient delete_matched cache method in domain blocks (#28374)	2023-12-18 16:14:43 +00:00
Matt Jankowski	0e5b8fc46b	Fix Style/RedundantReturn cop (#28391)	2023-12-18 09:50:51 +00:00
Matt Jankowski	3bc437b99a	Fix Style/RedundantParentheses cop (#28176)	2023-12-01 16:00:44 +00:00
Matt Jankowski	d83d01eb1e	Fix Lint/RedundantSafeNavigation cop (#28172)	2023-12-01 15:52:56 +00:00
Claire	963354978a	Add Account#unavailable? and Account#permanently_unavailable? aliases (#28053)	2023-11-30 15:43:26 +00:00
Matt Jankowski	1f1c75bba5	File cleanup/organization in controllers/concerns (#27846)	2023-11-30 14:39:41 +00:00
Matt Jankowski	e7c340a634	Spec coverage for missing q param and error conditions in api/v2/search controller (#27842)	2023-11-30 13:59:46 +00:00
Kevin Bongart	7877fcd83c	Deduplicate IDs in relationships and familiar_followers APIs (#27982)	2023-11-23 10:00:09 +00:00
Matt Jankowski	4be12791e6	Remove default_scope from StatusEdit class (#28042)	2023-11-23 09:26:11 +00:00
Matt Jankowski	9742bccbe7	Add coverage for api/v2/media endpoint (#28027)	2023-11-22 15:39:34 +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	fe58ac8d9f	Improve spec coverage for api/web/push_subscriptions controller (#27858) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-11-15 13:14:51 +00:00
Eugen Rochko	d67bd44ca1	Add profile setup to onboarding in web UI (#27829)	2023-11-15 11:13:53 +00:00
Matt Jankowski	7e1a77ea51	Add base class for api/v1/timelines/* controllers (#27840)	2023-11-14 14:53:31 +00:00
Matt Jankowski	d562fb8459	Specs for minimal CSP policy in Api:: controllers (#27845)	2023-11-14 14:34:30 +00:00
Matt Jankowski	1f8173ac5a	Extract private methods in api/v1/instances/domain_blocks (#27844)	2023-11-14 10:31:59 +00:00
Matt Jankowski	0945e25b8f	Add Api::V1::Statuses::BaseController base controller class (#27794)	2023-11-13 14:53:22 +00:00
Claire	07a4059901	Add support for invite codes in the registration API (#27805)	2023-11-13 13:27:00 +00:00
Eugen Rochko	0d14fcebae	Change link previews to keep original URL from the status (#27312)	2023-11-13 09:58:28 +00:00
Matt Jankowski	ac69f90098	Add Api::V1::Instances::BaseController base controller class (#27797)	2023-11-10 12:46:00 +00:00
Claire	c451bbe249	Allow viewing and severing relationships with suspended accounts (#27667)	2023-11-09 14:50:25 +00:00
Essem	1483b2b13d	More cleanup	2023-11-05 22:29:44 -06:00
Essem	c10194fc82	Merge branch 'main' of https://github.com/glitch-soc/mastodon	2023-10-20 11:48:03 -05:00
Claire	74fd46d3ab	Merge commit '9f218c9924' 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
Essem	81c06b286f	Merge branch 'main' of https://github.com/glitch-soc/mastodon	2023-09-16 11:27:11 -05:00
Claire	5ed72f668f	Merge commit 'b90383d073' into glitch-soc/merge-upstream	2023-09-15 21:39:21 +02:00
Claire	08b495d95c	Merge commit 'b1d8907138' into glitch-soc/merge-upstream	2023-09-15 21:06:45 +02:00