about summary refs log tree commit diff
path: root/app/views/admin
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-02-12 20:29:55 +0100
committerGitHub <noreply@github.com>2019-02-12 20:29:55 +0100
commita3ba28eb17d75af37396359e8c37675e06605ccf (patch)
tree20d81ffc7b01b132e1683685a0176ede6374c13c /app/views/admin
parentb89e003c4d049d64d2d4015357b8b931370bc5f0 (diff)
parentb47a53f90299a1fb52423aacbc0c23427e2eb132 (diff)
Merge pull request #913 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin')
-rw-r--r--app/views/admin/change_emails/show.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/change_emails/show.html.haml b/app/views/admin/change_emails/show.html.haml
index 6febef9b1..6ff0d785e 100644
--- a/app/views/admin/change_emails/show.html.haml
+++ b/app/views/admin/change_emails/show.html.haml
@@ -3,7 +3,7 @@
 
 = simple_form_for @user, url: admin_account_change_email_path(@account.id) do |f|
   .fields-group
-    = f.input :email, wrapper: :with_label, disabled: true, label: t('admin.accounts.change_email.current_email')
+    = f.input :email, wrapper: :with_label, hint: false, disabled: true, label: t('admin.accounts.change_email.current_email')
 
   .fields-group
     = f.input :unconfirmed_email, wrapper: :with_label, label: t('admin.accounts.change_email.new_email')