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 3550470c18 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json The above conflicts appear to be a text conflict introduced by glitch-soc's additional level of columns (i.e. moving a bunch of columns under the Misc option). They were resolved via accept-ours.		6 years ago
..
exports	Remove exports/base controller in favor of shared concern (#3444)	7 years ago
two_factor_authentication	Use raw status code on have_http_status (#7214)	6 years ago
applications_controller_spec.rb	Use raw status code on have_http_status (#7214)	6 years ago
deletes_controller_spec.rb	Use raw status code on have_http_status (#7214)	6 years ago
exports_controller_spec.rb	Use raw status code on have_http_status (#7214)	6 years ago
flavours_controller_spec.rb	Thank you, Officer Murphy	6 years ago
follower_domains_controller_spec.rb	Use raw status code on have_http_status (#7214)	6 years ago
imports_controller_spec.rb	Use raw status code on have_http_status (#7214)	6 years ago
keyword_mutes_controller_spec.rb	Set up /settings/keyword_mutes. #164.	7 years ago
migrations_controller_spec.rb	Add tests for migrations_controller (#7707)	6 years ago
notifications_controller_spec.rb	Use raw status code on have_http_status (#7214)	6 years ago
preferences_controller_spec.rb	Use raw status code on have_http_status (#7214)	6 years ago
profiles_controller_spec.rb	Use raw status code on have_http_status (#7214)	6 years ago
two_factor_authentications_controller_spec.rb	Use raw status code on have_http_status (#7214)	6 years ago