David Yip c87f1d99e4 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
..
activitypub	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
admin	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
api	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
auth	Reset locale on registration tests (#7219)	2018-04-21 23:37:07 +02:00
concerns	Fix randomly fail (similar #7219) (#7225)	2018-04-22 11:41:39 +02:00
oauth	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
settings	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
well_known	Serialize webfinger XML with Ox instead of Nokogiri (#7319)	2018-05-02 22:28:46 +02:00
about_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
account_follow_controller_spec.rb	Cover AccountFollowController more in spec (#3227)	2017-05-22 16:29:48 +02:00
account_unfollow_controller_spec.rb	Cover AccountUnfollowController more in spec (#3228)	2017-05-22 17:58:49 +02:00
accounts_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
application_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
authorize_follows_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
follower_accounts_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
following_accounts_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
home_controller_spec.rb	Redirect from Web tag timeline to public tag timeline if not signed in (#6633)	2018-03-05 19:29:36 +01:00
manifests_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
media_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
remote_follow_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
statuses_controller_spec.rb	Paginate descendant statuses in public page (#7148)	2018-04-23 19:27:35 +02:00
stream_entries_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
tags_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00