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

Merge upstream (#111)

Browse Source
This commit is contained in:
kibigo!
2017-08-01 13:07:43 -07:00
parent b61e3daf98 7ef8482568
commit 8150689b48
205 changed files with 1927 additions and 1507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,7 @@
%p.hint= t('deletes.description_html')
= f.input :password, autocomplete: 'off', placeholder: t('simple_form.labels.defaults.current_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.current_password') }, hint: t('deletes.confirm_password')
= f.input :password, placeholder: t('simple_form.labels.defaults.current_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.current_password'), :autocomplete => 'off' }, hint: t('deletes.confirm_password')
.actions
= f.button :button, t('deletes.proceed'), type: :submit, class: 'negative'

2
app/views/settings/two_factor_authentication/confirmations/new.html.haml
View File

@@ -11,7 +11,7 @@
%p.hint= t('two_factor_authentication.manual_instructions')
%samp.qr-alternative__code= current_user.otp_secret.scan(/.{4}/).join(' ')
= f.input :code, hint: t('two_factor_authentication.code_hint'), placeholder: t('simple_form.labels.defaults.otp_attempt')
= f.input :code, hint: t('two_factor_authentication.code_hint'), placeholder: t('simple_form.labels.defaults.otp_attempt'), input_html: { :autocomplete => 'off' }
.actions
= f.button :button, t('two_factor_authentication.enable'), type: :submit

2
app/views/settings/two_factor_authentications/show.html.haml
View File

@@ -10,7 +10,7 @@
%hr/
= simple_form_for @confirmation, url: settings_two_factor_authentication_path, method: :delete do |f|
= f.input :code, hint: t('two_factor_authentication.code_hint'), placeholder: t('simple_form.labels.defaults.otp_attempt')
= f.input :code, hint: t('two_factor_authentication.code_hint'), placeholder: t('simple_form.labels.defaults.otp_attempt'), input_html: { :autocomplete => 'off' }
.actions
= f.button :button, t('two_factor_authentication.disable'), type: :submit