Claire f8d867bac4 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/services/remove_status_service.rb`: Conflict caused by us having a distinc Direct timeline. Ported upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Conflict between glitch-soc's variable character limit and upstream refactoring that part of the code. Ported upstream changes.		2020-12-05 17:33:37 +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
jsonld_helper.rb
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	Display “Show newer” and “Show older” instead of “Show more” in public pages (#15052)	2020-11-04 21:15:45 +01:00
webfinger_helper.rb	Remove dependency on goldfinger gem (#14919)	2020-10-08 00:34:57 +02:00