diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 12:08:39 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 12:08:39 +0300 |
commit | 001243986195143c395a9811d8254bbf1b9ebfa1 (patch) | |
tree | 6d6d665154fd38beea6ea7f8985330f956565bb3 /app/views/devise | |
parent | 83d8c1d61762898eb4e69878f117cbb2ef5be494 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/devise')
-rw-r--r-- | app/views/devise/shared/_experimental_separate_sign_up_flow_box.html.haml | 2 | ||||
-rw-r--r-- | app/views/devise/shared/_experimental_separate_sign_up_flow_omniauth_box.haml | 13 |
2 files changed, 15 insertions, 0 deletions
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 4832861445b..7de7dec61b0 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 @@ -41,3 +41,5 @@ = recaptcha_tags .submit-container.mt-3 = f.submit _("Register"), class: "btn-register btn btn-block btn-success mb-0 p-2", data: { qa_selector: 'new_user_register_button' } + - if omniauth_enabled? && button_based_providers_enabled? + = render 'devise/shared/experimental_separate_sign_up_flow_omniauth_box' diff --git a/app/views/devise/shared/_experimental_separate_sign_up_flow_omniauth_box.haml b/app/views/devise/shared/_experimental_separate_sign_up_flow_omniauth_box.haml new file mode 100644 index 00000000000..d9143d90430 --- /dev/null +++ b/app/views/devise/shared/_experimental_separate_sign_up_flow_omniauth_box.haml @@ -0,0 +1,13 @@ +.omniauth-divider.d-flex.align-items-center.text-center + = _("or") +%label.label-bold.d-block + = _("Create an account using:") +- providers = enabled_button_based_providers +.d-flex.justify-content-between.flex-wrap + - providers.each do |provider| + - has_icon = provider_has_icon?(provider) + = link_to omniauth_authorize_path(:user, provider), method: :post, class: "btn d-flex align-items-center omniauth-btn text-left oauth-login mb-2 p-2 #{qa_class_for_provider(provider)}", id: "oauth-login-#{provider}" do + - if has_icon + = provider_image_tag(provider) + %span.ml-2 + = label_for_provider(provider) |