This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka 01eaeab56d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/application_controller.rb`: Conflict due to theming system. - `app/controllers/oauth/authorizations_controller.rb`: Conflict due to theming system.		2020-01-04 23:04:42 +01:00
..
credentials_controller_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-20 15:36:09 +01:00
follower_accounts_controller_spec.rb	Hide blocked users from more places (#12733)	2019-12-31 00:55:32 +01:00
following_accounts_controller_spec.rb	Hide blocked users from more places (#12733)	2019-12-31 00:55:32 +01: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