Skip to content
Snippets Groups Projects
Commit 55bca8a4 authored by Peter Hegman's avatar Peter Hegman :two:
Browse files

Merge branch 'saml-sso-padding' into 'master'

Fix padding regression for SAML SSO

See merge request !87956
parents 329bf0f7 05a305af
No related branches found
No related tags found
1 merge request!87956Fix padding regression for SAML SSO
Pipeline #546093532 passed with warnings
Pipeline: GitLab

#546104826

    ......@@ -8,20 +8,21 @@
    - else
    = render 'devise/shared/tab_single', tab_title: _('SAML SSO')
    .login-box
    .login-body
    .login-body.gl-px-5.gl-pt-5
    - if @group_saml_identity || !user_signed_in?
    %h4= _('Sign in to "%{group_name}"') % { group_name: @group_name }
    %h4.gl-mt-0= _('Sign in to "%{group_name}"') % { group_name: @group_name }
    - else
    %h4= _('Allow "%{group_name}" to sign you in') % { group_name: @group_name }
    %h4.gl-mt-0= _('Allow "%{group_name}" to sign you in') % { group_name: @group_name }
    %p= _('The "%{group_path}" group allows you to sign in with your Single Sign-On Account') % { group_path: @group_path }
    - if @group_saml_identity || !user_signed_in?
    %p= _("This will redirect you to an external sign in page.")
    = saml_link _('Sign in with Single Sign-On'), @group_path, html_class: 'btn btn-success btn-md gl-button btn-block qa-saml-sso-signin-button', redirect: @redirect_path
    = saml_link _('Sign in with Single Sign-On'), @group_path, html_class: 'btn btn-confirm btn-md gl-button btn-block qa-saml-sso-signin-button', redirect: @redirect_path
    - else
    .card.card-body.bs-callout-warning
    = _("Only proceed if you trust %{idp_url} to control your GitLab account sign in.") % { idp_url: @idp_url }
    = render Pajamas::AlertComponent.new(variant: :warning, dismissible: false, alert_class: 'gl-mb-5 gl-word-break-word') do |c|
    = c.body do
    = _("Only proceed if you trust %{idp_url} to control your GitLab account sign in.") % { idp_url: @idp_url }
    = saml_link _('Authorize'), @group_path, html_class: 'btn btn-success btn-md gl-button btn-block qa-saml-sso-signin-button'
    = saml_link _('Authorize'), @group_path, html_class: 'btn btn-confirm btn-md gl-button btn-block qa-saml-sso-signin-button'
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment