diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-07 21:08:21 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-07 21:08:21 +0000 |
| commit | a87ae2e97ee1eb3af2338e33bc3b2fb0e1ae1d42 (patch) | |
| tree | 698e1cefd12d12f9230b985988d91e6820f40040 /app/views/devise/shared/_signup_box.html.haml | |
| parent | 1850d48925997ccc467fe0cbe6144d1d67fbdb55 (diff) | |
| download | gitlab-ce-a87ae2e97ee1eb3af2338e33bc3b2fb0e1ae1d42.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/devise/shared/_signup_box.html.haml')
| -rw-r--r-- | app/views/devise/shared/_signup_box.html.haml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/app/views/devise/shared/_signup_box.html.haml b/app/views/devise/shared/_signup_box.html.haml index 07ef9a7914a..1fd81cdbac2 100644 --- a/app/views/devise/shared/_signup_box.html.haml +++ b/app/views/devise/shared/_signup_box.html.haml @@ -1,4 +1,4 @@ -- max_name_length = 255 +- max_first_name_length = max_last_name_length = 127 - max_username_length = 255 - min_username_length = 2 #register-pane.tab-pane.login-box{ role: 'tabpanel' } @@ -8,9 +8,13 @@ = render "devise/shared/error_messages", resource: resource - if Feature.enabled?(:invisible_captcha) = invisible_captcha - .name.form-group - = f.label :name, _('Full name'), class: 'label-bold' - = f.text_field :name, class: "form-control top js-block-emoji js-validate-length", :data => { :max_length => max_name_length, :max_length_message => s_("SignUp|Name is too long (maximum is %{max_length} characters).") % { max_length: max_name_length }, :qa_selector => 'new_user_name_field' }, required: true, title: _("This field is required.") + .name.form-row + .col.form-group + = f.label :first_name, _('First name'), for: 'new_user_first_name', class: 'label-bold' + = f.text_field :first_name, class: 'form-control top js-block-emoji js-validate-length', :data => { :max_length => max_first_name_length, :max_length_message => _("First name is too long (maximum is %{max_length} characters).") % { max_length: max_first_name_length }, :qa_selector => 'new_user_first_name_field' }, required: true, title: _("This field is required.") + .col.form-group + = f.label :last_name, _('Last name'), for: 'new_user_last_name', class: 'label-bold' + = f.text_field :last_name, class: "form-control top js-block-emoji js-validate-length", :data => { :max_length => max_last_name_length, :max_length_message => _("Last name is too long (maximum is %{max_length} characters).") % { max_length: max_last_name_length }, :qa_selector => 'new_user_last_name_field' }, required: true, title: _("This field is required.") .username.form-group = f.label :username, class: 'label-bold' = f.text_field :username, class: "form-control middle js-block-emoji js-validate-length js-validate-username", :data => { :min_length => min_username_length, :min_length_message => s_("SignUp|Username is too short (minimum is %{min_length} characters).") % { min_length: min_username_length }, :max_length => max_username_length, :max_length_message => s_("SignUp|Username is too long (maximum is %{max_length} characters).") % { max_length: max_username_length }, :qa_selector => 'new_user_username_field' }, pattern: Gitlab::PathRegex::NAMESPACE_FORMAT_REGEX_JS, required: true, title: _("Please create a username with only alphanumeric characters.") |