mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
mastodon-glitch/spec/controllers/api/v1/statuses
History
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.
 		2018-10-05 15:23:57 +02:00
..
bookmarks_controller_spec.rb Introduce OAuth scopes for bookmarks 2018-08-10 16:49:06 +02:00
favourited_by_accounts_controller_spec.rb Lint pass (#8876) 2018-10-04 12:36:53 +02:00
favourites_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
mutes_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
pins_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
reblogged_by_accounts_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
reblogs_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00