You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		7 years ago
..
exports	Remove exports/base controller in favor of shared concern (#3444)	8 years ago
two_factor_authentication	Use raw status code on have_http_status (#7214)	7 years ago
applications_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
deletes_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
exports_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
flavours_controller_spec.rb	Thank you, Officer Murphy	7 years ago
follower_domains_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
imports_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
keyword_mutes_controller_spec.rb	Set up /settings/keyword_mutes. #164.	7 years ago
notifications_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
preferences_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
profiles_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
two_factor_authentications_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago