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 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - app/controllers/api/v1/search_controller.rb Conflict because we changed the number of default results to be configurable - app/lib/settings/scoped_settings.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) - spec/controllers/application_controller_spec.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme)		5 years ago
..
direct_controller.rb	Remove deprecated REST API `GET /api/v1/timelines/direct` (#11212)	5 years ago
home_controller.rb	…
list_controller.rb	…
public_controller.rb	Change /api/v1/timelines/public to require auth when public preview is off (#11802)	5 years ago
tag_controller.rb	Fix `tagged` param not being normalized before querying tags (#10249)	6 years ago