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 ability to filter audit log in admin UI (#13381)	2020-04-03 13:06:34 +02:00
settings
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
home_helper_spec.rb	Fix locale related specs (#3707)	2017-06-12 10:58:03 +02:00
instance_helper_spec.rb
jsonld_helper_spec.rb
routing_helper_spec.rb
settings_helper_spec.rb	Fix language filter codes (#4841)	2017-09-08 12:32:22 +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