You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 4a70792b4a Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, just a glitch-soc-only dependency too close to a dependency that got updated upstream. Updated as well. - `app/models/status.rb`: Not a real conflict, just a change too close to glitch-soc-changed code for optionally showing boosts in public timelines. Applied upstream changes. - `app/views/layouts/application.html.haml`: Upstream a new, static CSS file, conflict due to glitch-soc's theming system, include the file regardless of the theme. - `config/initializers/content_security_policy.rb`: Upstream dropped 'unsafe-inline' from the 'style-src' directive, but both files are very different. Removed 'unsafe-inline' as well.		5 years ago
..
credentials_controller_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
follower_accounts_controller_spec.rb	Fix own following/followers not showing muted users (#13614)	5 years ago
following_accounts_controller_spec.rb	Fix own following/followers not showing muted users (#13614)	5 years ago
lists_controller_spec.rb	Add more granular OAuth scopes (#7929)	7 years ago
pins_controller_spec.rb	Add specs for Accounts::PinsController (#9542)	6 years ago
relationships_controller_spec.rb	Add more granular OAuth scopes (#7929)	7 years ago
search_controller_spec.rb	Add more granular OAuth scopes (#7929)	7 years ago
statuses_controller_spec.rb	Add more granular OAuth scopes (#7929)	7 years ago