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 e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it.		4 years ago
..
admin	Add IP-based rules (#14963)	4 years ago
settings	…
accounts_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
application_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
domain_control_helper.rb	Fix whitelist federation for subdomains (#12435)	5 years ago
flashes_helper.rb	…
home_helper.rb	Fix use of inline CSS in public pages (#13576)	4 years ago
instance_helper.rb	…
jsonld_helper.rb	…
routing_helper.rb	Fix ruby 2.7 warnings about keyword parameters (#12824)	5 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)	4 years ago
webfinger_helper.rb	Remove dependency on goldfinger gem (#14919)	4 years ago