about summary refs log tree commit diff
path: root/app/views/about
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-03-26 16:02:54 +0100
committerThibaut Girka <thib@sitedethib.com>2019-03-26 16:02:54 +0100
commitb9f314bba754074c7ac7dad37cdd35a0cbf1d1b5 (patch)
tree987f8ceff468686d7f4185cf2312e56aed45ecd1 /app/views/about
parent648cf8bfd51913929b7d0d3a637de496d6e40f89 (diff)
parent0c1a05b281c2665b52a644d51b9b06c2756479a7 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/locales/es.yml
- config/locales/pl.yml
- config/locales/pt-BR.yml
Diffstat (limited to 'app/views/about')
-rw-r--r--app/views/about/_registration.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/about/_registration.html.haml b/app/views/about/_registration.html.haml
index 4823ff375..09cbe2e28 100644
--- a/app/views/about/_registration.html.haml
+++ b/app/views/about/_registration.html.haml
@@ -4,7 +4,7 @@
 
     .fields-group
       = f.simple_fields_for :account do |account_fields|
-        = account_fields.input :username, wrapper: :with_label, autofocus: true, label: false, required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.username'), :autocomplete => 'off', placeholder: t('simple_form.labels.defaults.username') }, append: "@#{site_hostname}", hint: false, disabled: closed_registrations?
+        = account_fields.input :username, wrapper: :with_label, label: false, required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.username'), :autocomplete => 'off', placeholder: t('simple_form.labels.defaults.username') }, append: "@#{site_hostname}", hint: false, disabled: closed_registrations?
 
       = f.input :email, placeholder: t('simple_form.labels.defaults.email'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.email'), :autocomplete => 'off' }, hint: false, disabled: closed_registrations?
       = f.input :password, placeholder: t('simple_form.labels.defaults.password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.password'), :autocomplete => 'off' }, hint: false, disabled: closed_registrations?