mastodon/spec/controllers/settings
Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
2019-09-30 12:23:57 +02:00
..
exports
preferences
two_factor_authentication Add password challenge to 2FA settings, e-mail notifications (#11878) 2019-09-18 16:37:27 +02:00
applications_controller_spec.rb
deletes_controller_spec.rb
exports_controller_spec.rb
flavours_controller_spec.rb
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
migrations_controller_spec.rb Add account migration UI (#11846) 2019-09-19 20:58:19 +02:00
profiles_controller_spec.rb
sessions_controller_spec.rb
two_factor_authentications_controller_spec.rb Add password challenge to 2FA settings, e-mail notifications (#11878) 2019-09-18 16:37:27 +02:00