Thibaut Girka 41a98b6543 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- README.md
- app/helpers/statuses_helper.rb
  Upstream moved account helpers to their own file, we had extra
  helpers there, moved too.
- app/lib/sanitize_config.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- config/locales/simple_form.en.yml
- spec/lib/sanitize_config_spec.rb

2019-10-27 12:14:01 +01:00

..

admin

Split AccountsHelper from StatusesHelper (#12078)

2019-10-24 22:50:09 +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

Add pending specs for jsonld helper (#9750)

2019-01-08 12:18:27 +09:00

routing_helper_spec.rb

Use URI.join even when S3 enabled (#4652)

2017-08-21 12:42:16 +02:00

settings_helper_spec.rb

Fix language filter codes (#4841)

2017-09-08 12:32:22 +02:00

statuses_helper_spec.rb

Split AccountsHelper from StatusesHelper (#12078)

2019-10-24 22:50:09 +02:00