diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-19 00:06:37 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-19 00:06:37 +0300 |
commit | 4682f5015a5a2d7eedb66b3c90aee931d3789d0b (patch) | |
tree | 6240a8a5cf3584a893c6c3351141446e7856dc12 /app/views/devise | |
parent | 6d59e989185a7d2645792b713d1b5d95d46651fd (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/devise')
4 files changed, 4 insertions, 7 deletions
diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml index dfdf7429dc5..5f85235e8fa 100644 --- a/app/views/devise/registrations/new.html.haml +++ b/app/views/devise/registrations/new.html.haml @@ -1,5 +1,5 @@ - page_title "Sign up" -- if use_experimental_separate_sign_up_flow? +- if experiment_enabled?(:signup_flow) = render 'devise/shared/experimental_separate_sign_up_flow_box' - else = render 'devise/shared/signup_box' diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml index 17e5da501f5..8f6c3ecbe58 100644 --- a/app/views/devise/sessions/new.html.haml +++ b/app/views/devise/sessions/new.html.haml @@ -4,7 +4,7 @@ - if form_based_providers.any? = render 'devise/shared/tabs_ldap' - else - - unless use_experimental_separate_sign_up_flow? + - unless experiment_enabled?(:signup_flow) = render 'devise/shared/tabs_normal' .tab-content - if password_authentication_enabled_for_web? || ldap_enabled? || crowd_enabled? diff --git a/app/views/devise/shared/_experimental_separate_sign_up_flow_box.html.haml b/app/views/devise/shared/_experimental_separate_sign_up_flow_box.html.haml index f92c29da5e6..5d163d03c73 100644 --- a/app/views/devise/shared/_experimental_separate_sign_up_flow_box.html.haml +++ b/app/views/devise/shared/_experimental_separate_sign_up_flow_box.html.haml @@ -1,4 +1,4 @@ -- max_name_length = 128 +- content_for(:page_title, _('Register for GitLab')) - max_username_length = 255 .signup-box.p-3.mb-2 .signup-body @@ -6,9 +6,6 @@ .devise-errors.mt-0 = render "devise/shared/error_messages", resource: resource = 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.") .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 => { :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.") diff --git a/app/views/devise/shared/_signin_box.html.haml b/app/views/devise/shared/_signin_box.html.haml index deaceccbfc7..746d43edbad 100644 --- a/app/views/devise/shared/_signin_box.html.haml +++ b/app/views/devise/shared/_signin_box.html.haml @@ -23,7 +23,7 @@ .login-body = render 'devise/sessions/new_base' -- if use_experimental_separate_sign_up_flow? +- if experiment_enabled?(:signup_flow) %p.light.mt-2 = _("Don't have an account yet?") = link_to _("Register now"), new_registration_path(:user) |