diff options
Diffstat (limited to 'app/views/devise/shared')
| -rw-r--r-- | app/views/devise/shared/_signup_box.html.haml | 1 | ||||
| -rw-r--r-- | app/views/devise/shared/_signup_omniauth_provider_list.haml | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/views/devise/shared/_signup_box.html.haml b/app/views/devise/shared/_signup_box.html.haml index 970e490dd72..57135c6cdfc 100644 --- a/app/views/devise/shared/_signup_box.html.haml +++ b/app/views/devise/shared/_signup_box.html.haml @@ -49,6 +49,7 @@ data: { qa_selector: 'new_user_email_field' }, required: true, title: _('Please provide a valid email address.') + %p.gl-field-hint.text-secondary= _('We recommend a work email address.') .form-group.gl-mb-5#password-strength = f.label :password, class: 'label-bold' = f.password_field :password, diff --git a/app/views/devise/shared/_signup_omniauth_provider_list.haml b/app/views/devise/shared/_signup_omniauth_provider_list.haml index 6688308cd71..84aabbe0efd 100644 --- a/app/views/devise/shared/_signup_omniauth_provider_list.haml +++ b/app/views/devise/shared/_signup_omniauth_provider_list.haml @@ -1,8 +1,10 @@ +- register_omniauth_params = Feature.enabled?(:update_oauth_registration_flow) ? { intent: :register } : {} + %label.gl-font-weight-bold = _("Create an account using:") .gl-display-flex.gl-justify-content-between.gl-flex-wrap - providers.each do |provider| - = link_to omniauth_authorize_path(:user, provider), method: :post, class: "btn gl-button btn-default gl-w-full gl-mb-3 js-oauth-login #{qa_class_for_provider(provider)}", data: { provider: provider }, id: "oauth-login-#{provider}" do + = link_to omniauth_authorize_path(:user, provider, register_omniauth_params), method: :post, class: "btn gl-button btn-default gl-w-full gl-mb-3 js-oauth-login #{qa_class_for_provider(provider)}", data: { provider: provider }, id: "oauth-login-#{provider}" do - if provider_has_icon?(provider) = provider_image_tag(provider) %span.gl-button-text |