mastodon/spec/helpers
Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb

Moved public.js changes to settings.js.
2018-12-09 16:08:04 +01:00
..
admin Add specs for Admin::AccountModerationNotesHelper (#9455) 2018-12-07 16:39:20 +01:00
settings
application_helper_spec.rb Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02: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 Append '.test' to hostname in stub data (#7260) 2018-04-25 14:12:28 +02: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