This repository has been archived on 2023-07-01. You can view files and clone it, but cannot push or open issues or pull requests.

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
..
admin	Add moderation note (#5240)	2017-10-07 20:26:43 +02:00
settings	Set up /settings/keyword_mutes. #164.	2017-10-21 14:54:36 -05:00
application_helper_spec.rb	Hold value of I18n.locale with ApplicationHelperSpec (#3474)	2017-05-31 17:09:28 +02:00
flashes_helper_spec.rb	Spec FlashesHelper (#3414)	2017-05-29 18:03:02 +02:00
home_helper_spec.rb	Fix locale related specs (#3707)	2017-06-12 10:58:03 +02:00
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	Use URI.join even when S3 enabled (#4652)	2017-08-21 12:42:16 +02:00
settings_helper_spec.rb	Fix language filter codes (#4841)	2017-09-08 12:32:22 +02:00
stream_entries_helper_spec.rb	Remove empty strings (#5732)	2017-11-17 10:52:30 +09:00