diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-04-21 00:23:47 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-04-21 00:23:47 +0000 |
| commit | 2ade37e2534108c72d28605cb131dacf771d27d3 (patch) | |
| tree | 3f03b0f80793b3bef39fbb6bd925deb3f45f4763 | |
| parent | 7dc16fe6ba58a73b2586044a59d133c70d7fa419 (diff) | |
| parent | 26166b774eb2c297b64168fa873c0ac532eca8da (diff) | |
| download | gitlab-ce-2ade37e2534108c72d28605cb131dacf771d27d3.tar.gz | |
Merge branch 'disable_spellcheck_for_username_field' into 'master'
Disable spellcheck and autocorrect for username field in admin page
closes #14855
## before
## after
See merge request !3730
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/admin/users/_form.html.haml | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 433799eee2f..d4b8a509261 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -91,6 +91,7 @@ v 8.7.0 (unreleased) - Diff design updates (colors, button styles, etc) - Copying and pasting a diff no longer pastes the line numbers or +/- - Add null check to formData when updating profile content to fix Firefox bug + - Disable spellcheck and autocorrect for username field in admin page - Delete tags using Rugged for performance reasons (Robert Schilling) - Add Slack notifications when Wiki is edited (Sebastian Klier) - Diffs load at the correct point when linking from from number diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml index b05fdbd5552..fe0b9d3a491 100644 --- a/app/views/admin/users/_form.html.haml +++ b/app/views/admin/users/_form.html.haml @@ -7,17 +7,17 @@ .form-group = f.label :name, class: 'control-label' .col-sm-10 - = f.text_field :name, required: true, autocomplete: "off", class: 'form-control' + = f.text_field :name, required: true, autocomplete: 'off', class: 'form-control' %span.help-inline * required .form-group = f.label :username, class: 'control-label' .col-sm-10 - = f.text_field :username, required: true, autocomplete: "off", class: 'form-control' + = f.text_field :username, required: true, autocomplete: 'off', autocorrect: 'off', autocapitalize: 'off', spellcheck: false, class: 'form-control' %span.help-inline * required .form-group = f.label :email, class: 'control-label' .col-sm-10 - = f.text_field :email, required: true, autocomplete: "off", class: 'form-control' + = f.text_field :email, required: true, autocomplete: 'off', class: 'form-control' %span.help-inline * required - if @user.new_record? |