David Yip c816701550 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: .travis.yml Gemfile.lock README.md app/controllers/settings/follower_domains_controller.rb app/controllers/statuses_controller.rb app/javascript/mastodon/locales/ja.json app/lib/feed_manager.rb app/models/media_attachment.rb app/models/mute.rb app/models/status.rb app/services/mute_service.rb app/views/home/index.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/ca.yml config/locales/en.yml config/locales/es.yml config/locales/fr.yml config/locales/nl.yml config/locales/pl.yml config/locales/pt-BR.yml config/themes.yml		2018-05-03 17:23:44 -05:00
..
access_token_fabricator.rb	…
accessible_access_token_fabricator.rb	…
account_domain_block_fabricator.rb	…
account_fabricator.rb	Speed up test suite by not generating RSA keys in test environment (#7296)	2018-05-02 15:45:24 +02:00
account_moderation_note_fabricator.rb	…
admin_action_log_fabricator.rb	…
application_fabricator.rb	…
backup_fabricator.rb	…
block_fabricator.rb	…
bookmark_fabricator.rb	Add spec for bookmark endpoints	2018-04-11 21:05:34 +02:00
conversation_fabricator.rb	…
conversation_mute_fabricator.rb	…
custom_emoji_fabricator.rb	…
domain_block_fabricator.rb	…
email_domain_block_fabricator.rb	…
favourite_fabricator.rb	…
follow_fabricator.rb	…
follow_request_fabricator.rb	…
glitch_keyword_mute_fabricator.rb	…
identity_fabricator.rb	…
import_fabricator.rb	…
invite_fabricator.rb	…
list_account_fabricator.rb	…
list_fabricator.rb	…
media_attachment_fabricator.rb	…
mention_fabricator.rb	…
mute_fabricator.rb	…
notification_fabricator.rb	Change columns in notifications nonnullable (#6764)	2018-03-24 12:51:28 +01:00
report_fabricator.rb	…
session_activation_fabricator.rb	…
setting_fabricator.rb	…
site_upload_fabricator.rb	…
status_fabricator.rb	…
status_pin_fabricator.rb	…
stream_entry_fabricator.rb	…
subscription_fabricator.rb	…
tag_fabricator.rb	…
user_fabricator.rb	…
web_push_subscription_fabricator.rb	…
web_setting_fabricator.rb	…