You cannot 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 034ffc079e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.		7 years ago
..
accounts	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
apps	Use raw status code on have_http_status (#7214)	8 years ago
instances	Add specs for Api::V1::Instances::PeersController (#9546)	7 years ago
lists	Add more granular OAuth scopes (#7929)	8 years ago
push	Add REST API for Web Push Notifications subscriptions (#7445)	8 years ago
statuses	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
timelines	Add spec for Api::V1::Timelines::DirectController (#9547)	7 years ago
accounts_controller_spec.rb	Lint pass (#8876)	8 years ago
apps_controller_spec.rb	Use raw status code on have_http_status (#7214)	8 years ago
blocks_controller_spec.rb	Add more granular OAuth scopes (#7929)	8 years ago
bookmarks_controller_spec.rb	Introduce OAuth scopes for bookmarks	8 years ago
conversations_controller_spec.rb	Add conversations API (#8832)	7 years ago
custom_emojis_controller_spec.rb	Use raw status code on have_http_status (#7214)	8 years ago
domain_blocks_controller_spec.rb	Add more granular OAuth scopes (#7929)	8 years ago
endorsements_controller_spec.rb	Add spec for Api::V1::EndorsementsController (#9543)	7 years ago
favourites_controller_spec.rb	Support min_id-based pagination in REST API (#8736)	8 years ago
filter_controller_spec.rb	Add more granular OAuth scopes (#7929)	8 years ago
follow_requests_controller_spec.rb	Add more granular OAuth scopes (#7929)	8 years ago
follows_controller_spec.rb	Add more granular OAuth scopes (#7929)	8 years ago
instances_controller_spec.rb	Use raw status code on have_http_status (#7214)	8 years ago
lists_controller_spec.rb	Add more granular OAuth scopes (#7929)	8 years ago
media_controller_spec.rb	Add more granular OAuth scopes (#7929)	8 years ago
mutes_controller_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
notifications_controller_spec.rb	Add more granular OAuth scopes (#7929)	8 years ago
reports_controller_spec.rb	Support min_id-based pagination in REST API (#8736)	8 years ago
search_controller_spec.rb	Add more granular OAuth scopes (#7929)	8 years ago
statuses_controller_spec.rb	Add more granular OAuth scopes (#7929)	8 years ago
streaming_controller_spec.rb	Lint pass (#8876)	8 years ago
suggestions_controller_spec.rb	Re-add follow recommendations API (#7918)	8 years ago