Thibaut Girka ff76f6de4f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/views/admin/dashboard/index.html.haml - config/locales/simple_form.en.yml		2019-08-07 13:56:48 +02:00
..
exports	Export and import show_reblogs together with following list (#10495)	2019-04-08 07:28:27 +02:00
preferences	Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988)	2019-06-07 16:51:08 +02:00
two_factor_authentication	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
applications_controller_spec.rb	lint pass 2 (#8878)	2018-10-04 17:38:04 +02:00
deletes_controller_spec.rb	Change unconfirmed user login behaviour (#11375)	2019-07-22 10:48:50 +02:00
exports_controller_spec.rb	Add spec for Settings::ExportsController#create (#9512)	2018-12-13 02:53:52 +01:00
flavours_controller_spec.rb	Thank you, Officer Murphy	2018-01-10 12:10:43 -06:00
identity_proofs_controller_spec.rb	Bump faker from 1.9.6 to 2.1.0 and update faker api (#11489)	2019-08-06 15:33:03 +02:00
imports_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
migrations_controller_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
profiles_controller_spec.rb	Error message for avatar image that's too large. #9204 (#9518)	2018-12-14 05:07:21 +01:00
sessions_controller_spec.rb	Add missing tests for sessions controller (#7744)	2018-06-06 10:23:22 +09:00
two_factor_authentications_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00