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 720cb01715 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.		6 years ago
..
credentials_controller_spec.rb	Merge branch 'master' into glitch-soc/tentative-merge	6 years ago
follower_accounts_controller_spec.rb	Add more granular OAuth scopes (#7929)	6 years ago
following_accounts_controller_spec.rb	Add more granular OAuth scopes (#7929)	6 years ago
lists_controller_spec.rb	Add more granular OAuth scopes (#7929)	6 years ago
pins_controller_spec.rb	Add specs for Accounts::PinsController (#9542)	6 years ago
relationships_controller_spec.rb	Add more granular OAuth scopes (#7929)	6 years ago
search_controller_spec.rb	Add more granular OAuth scopes (#7929)	6 years ago
statuses_controller_spec.rb	Add more granular OAuth scopes (#7929)	6 years ago