Claire be493b6c0d Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Not a real conflict, just upstream getting rid of unused constants too close to glitch-soc-specific contents. Removed unused constants like upstream did. - `app/models/trends.rb`: Conflict because glitch-soc disabled email notifications for trending links. Upstream has refactored this quite a bit and added trending posts. Took upstream code, but disabling the extra trending stuff will come in another commit. - `app/views/admin/trends/links/index.html.haml`: Conflict due to glitch-soc's theming system. Ported upstream changes accordingly.		2022-02-26 09:29:23 +01:00
..
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-11 21:53:20 +01:00
admin	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
announcements	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
apps	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
instances	Add specs for Api::V1::Instances::PeersController (#9546)	2018-12-17 11:35:55 +01:00
lists	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
polls	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
push	Add policy param to POST /api/v1/push/subscriptions (#16040)	2021-04-15 05:00:25 +02:00
statuses	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
timelines	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-28 08:58:32 +01:00
trends	Add trending statuses (#17431)	2022-02-25 00:34:14 +01:00
accounts_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
announcements_controller_spec.rb	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
apps_controller_spec.rb	Fix app name, website and redirect URIs not having a maximum length (#16042)	2021-04-15 16:28:43 +02:00
blocks_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
bookmarks_controller_spec.rb	Support min_id-based pagination for bookmarks (#12381)	2019-11-17 17:09:41 +01:00
conversations_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
custom_emojis_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
domain_blocks_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
endorsements_controller_spec.rb	Add spec for Api::V1::EndorsementsController (#9543)	2018-12-17 11:32:44 +01:00
favourites_controller_spec.rb	Support min_id-based pagination in REST API (#8736)	2018-09-28 02:23:45 +02:00
filters_controller_spec.rb	Add polls (#10111)	2019-03-03 22:18:23 +01:00
follow_requests_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
instances_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
lists_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
markers_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
media_controller_spec.rb	Add editing for published statuses (#17320)	2022-02-10 00:15:30 +01:00
mutes_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
notifications_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
polls_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
reports_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
statuses_controller_spec.rb	Add editing for published statuses (#17320)	2022-02-10 00:15:30 +01:00
streaming_controller_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
suggestions_controller_spec.rb	Re-add follow recommendations API (#7918)	2018-07-03 01:47:56 +02:00