Thibaut Girka 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml

2019-04-01 21:28:31 +02:00

..

bookmarks_controller.rb

Introduce OAuth scopes for bookmarks

2018-08-10 16:49:06 +02:00

favourited_by_accounts_controller.rb

Hide blocking accounts from blocked users (#10442)

2019-04-01 20:06:13 +02:00

favourites_controller.rb

Add more granular OAuth scopes (#7929)

2018-07-05 18:31:35 +02:00

mutes_controller.rb

Add more granular OAuth scopes (#7929)

2018-07-05 18:31:35 +02:00

pins_controller.rb

Add more granular OAuth scopes (#7929)

2018-07-05 18:31:35 +02:00

reblogged_by_accounts_controller.rb

Hide blocking accounts from blocked users (#10442)

2019-04-01 20:06:13 +02:00

reblogs_controller.rb

Add visibility param to reblog REST API (#9851)

2019-03-15 04:36:41 +01:00