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.
mastodon/spec/controllers/api/v1/statuses
Thibaut Girka 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	db/migrate/20170716191202_add_hide_notifications_to_mute.rb
	spec/controllers/application_controller_spec.rb

Took our version, upstream changes were only minor style linting.
7 years ago
..
bookmarks_controller_spec.rb Introduce OAuth scopes for bookmarks 7 years ago
favourited_by_accounts_controller_spec.rb Lint pass (#8876) 7 years ago
favourites_controller_spec.rb Add more granular OAuth scopes (#7929) 7 years ago
mutes_controller_spec.rb Add more granular OAuth scopes (#7929) 7 years ago
pins_controller_spec.rb Add more granular OAuth scopes (#7929) 7 years ago
reblogged_by_accounts_controller_spec.rb Add more granular OAuth scopes (#7929) 7 years ago
reblogs_controller_spec.rb Add more granular OAuth scopes (#7929) 7 years ago