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

…

migration

Add (back) option to set redirect notice on account without moving followers (#11994)

2019-09-29 05:03:19 +02:00

preferences

…

two_factor_authentication

Add password challenge to 2FA settings, e-mail notifications (#11878)

2019-09-18 16:37:27 +02:00

aliases_controller.rb

Addition of update activity distribution by alias, minor correction (#11905)

2019-09-21 09:11:21 +02:00

applications_controller.rb

…

base_controller.rb

…

deletes_controller.rb

…

exports_controller.rb

Add account migration UI (#11846)

2019-09-19 20:58:19 +02:00

featured_tags_controller.rb

…

flavours_controller.rb

…

identity_proofs_controller.rb

…

imports_controller.rb

…

migrations_controller.rb

Fix account migration not affecting followers on origin server (#11980)

2019-09-29 16:23:13 +02:00

preferences_controller.rb

…

profiles_controller.rb

…

sessions_controller.rb

…

two_factor_authentications_controller.rb

Add password challenge to 2FA settings, e-mail notifications (#11878)

2019-09-18 16:37:27 +02:00