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 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.		2020-05-10 16:19:56 +02:00
..
direct_controller.rb	Remove deprecated REST API `GET /api/v1/timelines/direct` (#11212)	2019-07-05 02:14:56 +02:00
home_controller.rb	Remove useless `respond_to` calls (#13208)	2020-03-06 01:29:38 +01:00
list_controller.rb	Support min_id-based pagination in REST API (#8736)	2018-09-28 02:23:45 +02:00
public_controller.rb	Add remote only to public timeline (#13504)	2020-05-10 10:36:18 +02:00
tag_controller.rb	Remove useless `respond_to` calls (#13208)	2020-03-06 01:29:38 +01:00