1
0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-15 07:34:58 +01:00
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 () 2018-12-07 16:39:20 +01:00
settings Set up /settings/keyword_mutes. . 2017-10-21 14:54:36 -05:00
application_helper_spec.rb Revert Font Awesome 5 upgrade () 2018-09-28 02:11:14 +02:00
flashes_helper_spec.rb Spec FlashesHelper () 2017-05-29 18:03:02 +02:00
home_helper_spec.rb Fix locale related specs () 2017-06-12 10:58:03 +02:00
instance_helper_spec.rb Do not default site_title with site_hostname in InstanceHelper () 2018-03-04 20:29:49 +01:00
jsonld_helper_spec.rb Append '.test' to hostname in stub data () 2018-04-25 14:12:28 +02:00
routing_helper_spec.rb Use URI.join even when S3 enabled () 2017-08-21 12:42:16 +02:00
settings_helper_spec.rb Fix language filter codes () 2017-09-08 12:32:22 +02:00
stream_entries_helper_spec.rb Display full acct on public status pages, always () 2018-07-14 04:07:47 +02:00