Claire 0845bee8d6 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Upstream renamed some helper functions that were used in a part of the settings page which glitch-soc slightly changed the layout of. Ported the change.		2022-02-09 17:28:33 +01:00
..
admin	Add ability to filter audit log in admin UI (#13381)	2020-04-03 13:06:34 +02:00
settings	Set up /settings/keyword_mutes. #164.	2017-10-21 14:54:36 -05:00
accounts_helper_spec.rb	Split AccountsHelper from StatusesHelper (#12078)	2019-10-24 22:50:09 +02:00
application_helper_spec.rb	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
flashes_helper_spec.rb	Spec FlashesHelper (#3414)	2017-05-29 18:03:02 +02:00
home_helper_spec.rb	Fix locale related specs (#3707)	2017-06-12 10:58:03 +02:00
instance_helper_spec.rb	Do not default site_title with site_hostname in InstanceHelper (#6624)	2018-03-04 20:29:49 +01:00
jsonld_helper_spec.rb	Fix compacted JSON-LD possibly causing compatibility issues on forwarding (#17428)	2022-02-03 14:09:04 +01:00
languages_helper_spec.rb	Change languages to be listed under standard instead of native name in admin UI (#17485)	2022-02-09 04:15:38 +01:00
routing_helper_spec.rb	Use URI.join even when S3 enabled (#4652)	2017-08-21 12:42:16 +02:00
statuses_helper_spec.rb	Change RTL detection to rely on unicode-bidi paragraph by paragraph (#14573)	2020-12-15 12:56:43 +01:00