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
..
admin	Change admin UI for hashtags and add back whitelisted trends (#11490)	5 years ago
settings	…
application_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
domain_control_helper.rb	Add whitelist mode (#11291)	5 years ago
flashes_helper.rb	…
home_helper.rb	…
instance_helper.rb	Change OpenGraph description on sign-up page to reflect invite (#11744)	5 years ago
jsonld_helper.rb	…
routing_helper.rb	…
settings_helper.rb	Fix name of Portuguese language not including Portugal (#11820)	5 years ago
statuses_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago