tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix 2FA challenge and password challenge for non-database users (#11831)

Browse Source 
* Fix 2FA challenge not appearing for non-database users

Fix #11685

* Fix account deletion not working when using external login

Fix #11691
This commit is contained in:
Eugen Rochko
2019-09-15 21:08:39 +02:00
committed by GitHub
parent 1511638975
commit c707ef49d9
7 changed files with 66 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/settings/deletes/show.html.haml
View File

@ -20,7 +20,10 @@
%hr.spacer/
= f.input :password, wrapper: :with_block_label, input_html: { :autocomplete => 'off' }, hint: t('deletes.confirm_password')
- if current_user.encrypted_password.present?
= f.input :password, wrapper: :with_block_label, input_html: { :autocomplete => 'off' }, hint: t('deletes.confirm_password')
- else
= f.input :username, wrapper: :with_block_label, input_html: { :autocomplete => 'off' }, hint: t('deletes.confirm_username')
.actions
= f.button :button, t('deletes.proceed'), type: :submit, class: 'negative'