catstodon/spec/controllers/api/v1/accounts
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
..
credentials_controller_spec.rb Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
follower_accounts_controller_spec.rb Hide blocking accounts from blocked users (#10442) 2019-04-01 20:06:13 +02:00
following_accounts_controller_spec.rb Hide blocking accounts from blocked users (#10442) 2019-04-01 20:06:13 +02:00
lists_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
pins_controller_spec.rb Add specs for Accounts::PinsController (#9542) 2018-12-17 06:03:51 +01:00
relationships_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
search_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
statuses_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00