This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/spec/helpers
Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb
2018-10-01 12:43:20 +02:00
..
admin
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
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