You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire f5a9971cac Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated copyright year, we don't mention it so kept our version. - `app/controllers/admin/dashboard_controller.rb`: Not really a conflict, upstream change (removing the spam checker) too close to glitch-soc changes. Ported upstream changes. - `app/models/form/admin_settings.rb`: Same. - `app/services/remove_status_service.rb`: Same. - `app/views/admin/settings/edit.html.haml`: Same. - `config/settings.yml`: Same. - `config/environments/production.rb`: Not a real conflict, upstream added a default HTTP header, but we have extra headers in glitch-soc. Added the header.		4 years ago
..
accounts	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
admin	Add support for reversible suspensions through ActivityPub (#14989)	4 years ago
announcements	Add announcements (#12662)	5 years ago
apps	Use raw status code on have_http_status (#7214)	7 years ago
instances	Add specs for Api::V1::Instances::PeersController (#9546)	6 years ago
lists	Add more granular OAuth scopes (#7929)	6 years ago
polls	Add polls (#10111)	6 years ago
push	Add `policy` param to `POST /api/v1/push/subscriptions` (#16040)	4 years ago
statuses	Fix not being able to unfavorite toots one has lost access to (#15192)	4 years ago
timelines	Fix tests being broken because of different default setting	5 years ago
accounts_controller_spec.rb	Fix muting users with duration via the REST api (#15516)	4 years ago
announcements_controller_spec.rb	Add announcements (#12662)	5 years ago
apps_controller_spec.rb	Fix app name, website and redirect URIs not having a maximum length (#16042)	4 years ago
blocks_controller_spec.rb	Add more granular OAuth scopes (#7929)	6 years ago
bookmarks_controller_spec.rb	Support min_id-based pagination for bookmarks (#12381)	5 years ago
conversations_controller_spec.rb	Add scheduled statuses (#9706)	6 years ago
custom_emojis_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
domain_blocks_controller_spec.rb	Add more granular OAuth scopes (#7929)	6 years ago
endorsements_controller_spec.rb	Add spec for Api::V1::EndorsementsController (#9543)	6 years ago
favourites_controller_spec.rb	Support min_id-based pagination in REST API (#8736)	6 years ago
filters_controller_spec.rb	Add polls (#10111)	6 years ago
follow_requests_controller_spec.rb	Change ResolveAccountService's handling of skip_webfinger (#15750)	4 years ago
instances_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
lists_controller_spec.rb	Add more granular OAuth scopes (#7929)	6 years ago
markers_controller_spec.rb	Add timeline read markers API (#11762)	5 years ago
media_controller_spec.rb	Update Mastodon to Rails 6.1 (#15910)	4 years ago
mutes_controller_spec.rb	Remove glitch-soc specific and obsolete /api/v1/mutes/details	4 years ago
notifications_controller_spec.rb	Change ResolveAccountService's handling of skip_webfinger (#15750)	4 years ago
polls_controller_spec.rb	Fix poll API not requiring authentication on non-public polls (#10960)	6 years ago
reports_controller_spec.rb	Support min_id-based pagination in REST API (#8736)	6 years ago
statuses_controller_spec.rb	Add specific rate limits for posting and following (#13172)	5 years ago
streaming_controller_spec.rb	Lint pass (#8876)	6 years ago
suggestions_controller_spec.rb	Re-add follow recommendations API (#7918)	6 years ago
trends_controller_spec.rb	Add announcements (#12662)	5 years ago