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)		2019-09-13 18:13:43 +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	Support min_id-based pagination in REST API (#8736)	2018-09-28 02:23:45 +02:00
list_controller.rb	Support min_id-based pagination in REST API (#8736)	2018-09-28 02:23:45 +02:00
public_controller.rb	Change /api/v1/timelines/public to require auth when public preview is off (#11802)	2019-09-13 16:03:46 +02:00
tag_controller.rb	Fix tagged param not being normalized before querying tags (#10249)	2019-03-13 13:02:13 +01:00