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.

Claire 5e11f3a6e1 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/modal.scss`: For some reason we changed the file loading path in glitch-soc, but now upstream has completely changed how the logo is loaded. Applied upstream changes.		3 years ago
..
admin	Add IP-based rules (#14963)	4 years ago
settings	Set up /settings/keyword_mutes. #164.	7 years ago
accounts_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
application_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	3 years ago
domain_control_helper.rb	Fix whitelist federation for subdomains (#12435)	5 years ago
flashes_helper.rb	Clean up flash display in views (#2336)	7 years ago
home_helper.rb	Fix use of inline CSS in public pages (#13576)	4 years ago
instance_helper.rb	Change OpenGraph description on sign-up page to reflect invite (#11744)	5 years ago
jsonld_helper.rb	Bump json-ld-preloaded from 3.0.2 to 3.0.3 (#11316)	5 years ago
mascot_helper.rb	Use custom mascot on static share page (#15687)	3 years ago
routing_helper.rb	Fix ruby 2.7 warnings about keyword parameters (#12824)	4 years ago
settings_helper.rb	Add missing locales (#15138)	4 years ago
statuses_helper.rb	Change RTL detection to rely on unicode-bidi paragraph by paragraph (#14573)	3 years ago
webfinger_helper.rb	Remove dependency on goldfinger gem (#14919)	4 years ago