Thibaut Girka 07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/views/admin/settings/edit.html.haml:
  Conflict due to how the theming settings change.

2019-03-14 17:17:20 +01:00

..

admin

Add specs for Admin::AccountModerationNotesHelper (#9455)

2018-12-07 16:39:20 +01:00

settings

Set up /settings/keyword_mutes. #164.

2017-10-21 14:54:36 -05: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

…

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

…

settings_helper_spec.rb

…

stream_entries_helper_spec.rb

Display full acct on public status pages, always (#8011)

2018-07-14 04:07:47 +02:00