983 commits

Author	SHA1	Message	Date
Essem	a7b905d573	Merge remote-tracking branch 'upstream/main'	2024-05-02 23:31:54 -05:00
Claire	b039e62194	Merge commit 'a2399046ca' into glitch-soc/merge-upstream	2024-05-01 19:49:59 +02:00
Claire	6204d13a2e	Merge commit 'ec71c02c4b' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile`: There was an extra newline in glitch-soc for some reason. Removed it.	2024-05-01 19:38:34 +02:00
Claire	360590ecd8	Merge commit 'a390299744' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Conflict due to glitch-soc's local-only posting feature. Refactored as upstream did but kept local changes. - `app/lib/account_statuses_filter.rb`: Conflict due to glitch-soc's local-only posting feature. Refactored as upstream did but kept local changes.	2024-05-01 19:30:41 +02:00
Emelia Smith	049b159beb	Add read:me OAuth 2.0 scope, allowing more limited access to user data (#29087)	2024-04-23 11:47:00 +00:00
Matt Jankowski	650c548c31	Add not_featured_by scope to Tag (#28815)	2024-04-17 10:05:38 +00:00
Matt Jankowski	1d3ecd3fba	Add API::Pagination concern (#28826)	2024-04-17 09:22:45 +00:00
Matt Jankowski	caad1e2628	Add scope Status.distributable_visibility (#29950)	2024-04-16 13:16:54 +00:00
Essem	ce98ee9b00	Merge remote-tracking branch 'upstream/main'	2024-04-10 17:36:38 -05:00
Claire	777984faeb	Merge commit '119c7aa0df' into glitch-soc/merge-upstream	2024-04-06 20:34:07 +02:00
Matt Jankowski	34f293475e	Fix results/query in api/v1/featured_tags/suggestions (#29597)	2024-03-22 15:08:27 +00:00
Essem	aaf54c6395	Merge remote-tracking branch 'upstream/main'	2024-03-20 16:41:33 -05:00
Claire	876aa35350	Merge commit 'ffc5be4820' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream updated a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did. - `yarn.lock`: Upstream updated a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did.	2024-03-19 19:21:12 +01:00
Matt Jankowski	b5115850bb	Move repeated insert_pagination_headers method to api base class (#29606)	2024-03-18 10:11:53 +00:00
Essem	fd1f0891d9	Merge remote-tracking branch 'upstream/main'	2024-03-14 20:36:26 -05:00
Claire	e91ede5be6	Merge commit 'df6086d402' into glitch-soc/merge-upstream	2024-03-14 17:27:16 +01:00
Matt Jankowski	f9100743ec	Add Api::ErrorHandling concern for api/base controller (#29574)	2024-03-14 09:09:47 +00:00
Claire	06881a8669	Merge commit '2c0441acd7' into glitch-soc/merge-upstream	2024-03-13 19:16:47 +01:00
Matt Jankowski	9754967d5f	Move pagination_max_id and pagination_since_id into api/base controller (#28844)	2024-03-13 08:51:44 +00:00
Claire	a5127d0ef8	Merge commit '24319836de' into glitch-soc/merge-upstream ... Conflicts: - `config/routes/api.rb`: glitch-soc has an extra `:destroy` action on notifications for historical reasons. Kept it for now, while otherwise updating as upstream did.	2024-03-11 17:29:07 +01:00
Eugen Rochko	c10bbf5fe3	Add notification policies and notification requests in web UI (#29433)	2024-03-11 15:02:21 +00:00
Eugen Rochko	50b17f7e10	Add notification policies and notification requests (#29366)	2024-03-07 14:53:37 +00:00
Essem	c609845d47	Merge remote-tracking branch 'upstream/main'	2024-02-29 16:35:17 -06:00
Claire	4d7e7cc562	Merge commit '6dfe318f34' into glitch-soc/merge-upstream	2024-02-29 18:24:47 +01:00
Matt Jankowski	eb1b8f69de	Allow pagination Link headers on API accounts/statuses when pinned true (#29442)	2024-02-29 14:21:56 +00:00
Essem	fd6bd9c87b	Merge remote-tracking branch 'upstream/main'	2024-02-25 12:15:38 -06:00
Claire	ab2f0daa10	Merge commit 'aaa58d4807' 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
Matt Jankowski	2f19ddd1fa	Move status serializer error handling to private method (#29031)	2024-02-06 14:54:26 +00:00
Matt Jankowski	93a5b3f9df	Move status serializer chooser to private method (#29030)	2024-02-06 13:33:42 +00:00
Matt Jankowski	4cf07ed78c	Add missing action logging to api/v1/admin/reports#update (#29044)	2024-02-06 11:34:11 +00:00
Essem	dd7de07232	Merge remote-tracking branch 'upstream/main'	2024-01-26 21:57:28 -06:00
Claire	70de52c297	Merge commit '7a1f087659' into glitch-soc/merge-upstream	2024-01-25 19:51:19 +01:00
Essem	69e4361a1d	Merge remote-tracking branch 'upstream/main'	2024-01-24 21:09:39 -06:00
Claire	22cfab0ebf	Merge commit '01ce9df880' into glitch-soc/merge-upstream ... Conflicts: - `tsconfig.json`: Upstream made style fixes, while glitch-soc had extra options. Ported upstream's style fixes.	2024-01-24 20:42:53 +01:00
Eugen Rochko	5b1eb09d54	Add annual reports for accounts (#28693)	2024-01-24 09:38:10 +00:00
Essem	e211e4e0ce	Simplify reactions API controller	2024-01-23 22:59:42 -06:00
Matt Jankowski	c0e8e457ab	Eager loading fixes for api/ controllers (#28848)	2024-01-23 11:41:54 +00:00
Claire	102eff7c05	Merge commit 'e2d9635074' into glitch-soc/merge-upstream	2024-01-22 19:19:40 +01:00
Claire	0700eb58bc	Merge commit '163db814c2' into glitch-soc/merge-upstream	2024-01-22 19:12:05 +01:00
Matt Jankowski	7ecf7f5403	Move controller->request specs for api/v1/statuses/* (#28818)	2024-01-22 11:58:54 +00:00
Essem	54fb7c54c4	Merge remote-tracking branch 'upstream/main'	2024-01-19 14:59:02 -06:00
Matt Jankowski	329911b0a3	Migrate controller->request spec for api/v1/follow* (#28811)	2024-01-19 09:32:41 +00:00
Claire	528a8fa495	Merge commit 'f866413e72' into glitch-soc/merge-upstream	2024-01-18 22:16:16 +01:00
Matt Jankowski	0b853678a4	Add coverage for api/v1/peers/search endpoint and extract controller query to Instance scope (#28796)	2024-01-18 15:57:10 +00:00
Essem	d983bae9d2	Revert variant selector normalization ... Probably worth tackling later, but for now it's not worth worrying about; some other implementations (e.g. Misskey's) look to have the same behavior anyways.	2024-01-17 18:04:36 -06:00
Essem	d96fd9f28f	Merge remote-tracking branch 'upstream/main'	2024-01-16 13:04:33 -06:00
Claire	2f521bc84a	Merge commit 'a2f02a0775' into glitch-soc/merge-upstream	2024-01-15 20:27:41 +01:00
Matt Jankowski	e72676e83a	Improve api/v1/markers#create performance against simultaneous requests (#28718)	2024-01-15 09:47:25 +00:00
Essem	2a6cc053f9	Move reaction normalization to API controller	2024-01-14 15:59:27 -06:00
Essem	843725b25b	Merge remote-tracking branch 'upstream/main'	2024-01-11 20:51:45 -06:00