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.

Thibaut Girka 249991c498 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile.lock - app/controllers/accounts_controller.rb - app/controllers/admin/dashboard_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/following_accounts_controller.rb - app/controllers/remote_follow_controller.rb - app/controllers/stream_entries_controller.rb - app/controllers/tags_controller.rb - app/javascript/packs/public.js - app/lib/sanitize_config.rb - app/models/account.rb - app/models/form/admin_settings.rb - app/models/media_attachment.rb - app/models/stream_entry.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/services/batched_remove_status_service.rb - app/services/post_status_service.rb - app/services/process_mentions_service.rb - app/services/reblog_service.rb - app/services/remove_status_service.rb - app/views/admin/settings/edit.html.haml - config/locales/simple_form.pl.yml - config/settings.yml - docker-compose.yml		5 years ago
..
accounts	Change bio limit from 160 to 500 (#10790)	6 years ago
admin	Add moderation API (#9387)	6 years ago
apps	…
instances	Add specs for Api::V1::Instances::PeersController (#9546)	6 years ago
lists	…
polls	Add polls (#10111)	6 years ago
push	…
statuses	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
timelines	Remove deprecated REST API `GET /api/v1/timelines/direct` (#11212)	5 years ago
accounts_controller_spec.rb	Add REST API for creating an account (#9572)	6 years ago
apps_controller_spec.rb	…
blocks_controller_spec.rb	…
bookmarks_controller_spec.rb	…
conversations_controller_spec.rb	Add scheduled statuses (#9706)	6 years ago
custom_emojis_controller_spec.rb	…
domain_blocks_controller_spec.rb	…
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	…
instances_controller_spec.rb	…
lists_controller_spec.rb	…
media_controller_spec.rb	Not to skip executable specs (#9753)	6 years ago
mutes_controller_spec.rb	…
notifications_controller_spec.rb	Add `account_id` param to `GET /api/v1/notifications` (#10796)	6 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
search_controller_spec.rb	…
statuses_controller_spec.rb	Remove deprecated REST API `GET /api/v1/statuses/:id/card` (#11213)	5 years ago
streaming_controller_spec.rb	Lint pass (#8876)	6 years ago
suggestions_controller_spec.rb	…