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 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
..
admin	Change admin UI for hashtags and add back whitelisted trends (#11490)	2019-08-05 19:54:29 +02:00
settings	…
application_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-13 18:13:43 +02:00
domain_control_helper.rb	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
flashes_helper.rb	…
home_helper.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	2019-07-07 16:16:51 +02:00
instance_helper.rb	Change OpenGraph description on sign-up page to reflect invite (#11744)	2019-09-03 04:56:54 +02:00
jsonld_helper.rb	Bump json-ld-preloaded from 3.0.2 to 3.0.3 (#11316)	2019-07-28 13:48:43 +02:00
routing_helper.rb	…
settings_helper.rb	Fix name of Portuguese language not including Portugal (#11820)	2019-09-13 16:00:19 +02:00
statuses_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-30 13:38:41 +02:00