chuckya/spec/controllers/settings
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.
2018-06-02 16:15:36 -05:00
..
exports Remove exports/base controller in favor of shared concern (#3444) 2017-05-30 19:06:01 +02:00
two_factor_authentication Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
applications_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
deletes_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
exports_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
flavours_controller_spec.rb Thank you, Officer Murphy 2018-01-10 12:10:43 -06:00
follower_domains_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
imports_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
keyword_mutes_controller_spec.rb Set up /settings/keyword_mutes. #164. 2017-10-21 14:54:36 -05:00
migrations_controller_spec.rb Add tests for migrations_controller (#7707) 2018-06-02 18:52:16 +09:00
notifications_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
preferences_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
profiles_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
two_factor_authentications_controller_spec.rb Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00