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.		2020-12-15 14:27:06 +01:00
..
admin	Add IP-based rules (#14963)	2020-10-12 16:33:49 +02:00
settings
accounts_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-02-06 21:36:38 +01:00
application_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-05 17:33:37 +01:00
domain_control_helper.rb	Fix whitelist federation for subdomains (#12435)	2019-11-21 11:35:39 +01:00
flashes_helper.rb
home_helper.rb	Fix use of inline CSS in public pages (#13576)	2020-05-03 22:04:18 +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	Fix ruby 2.7 warnings about keyword parameters (#12824)	2020-01-11 21:38:02 +01:00
settings_helper.rb	Add missing locales (#15138)	2020-11-10 14:44:17 +01:00
statuses_helper.rb	Change RTL detection to rely on unicode-bidi paragraph by paragraph (#14573)	2020-12-15 12:56:43 +01:00
webfinger_helper.rb	Remove dependency on goldfinger gem (#14919)	2020-10-08 00:34:57 +02:00