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 9044a2b051 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/directories/index.html.haml Upstream has redesigned the profile directory, and we had a glitch-soc-specific change to hide follower counts. Ported that change to the new design.		5 years ago
..
admin	Change admin UI for hashtags and add back whitelisted trends (#11490)	5 years ago
settings	Set up /settings/keyword_mutes. #164.	7 years ago
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	Clean up flash display in views (#2336)	8 years ago
home_helper.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	6 years ago
instance_helper.rb	Do not default site_title with site_hostname in InstanceHelper (#6624)	7 years ago
jsonld_helper.rb	Bump json-ld-preloaded from 3.0.2 to 3.0.3 (#11316)	5 years ago
routing_helper.rb	Fallback default thumbnail in instance status API (#6177)	7 years ago
settings_helper.rb	Add missing locales (bn, ga, hi) (#10295)	6 years ago
statuses_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago