diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-10-11 17:17:51 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-10-11 17:17:51 +0300 |
| commit | 5b6b2871dfc8f2159103df7f2803459b2cee1647 (patch) | |
| tree | dd76fd6c88b5f7a9224ff9bbffb8cba5895c0bc5 /app | |
| parent | 681df101d0d0c5ba078249dfc840c7f3c0cfab23 (diff) | |
| parent | 154ce29d05a7f5dc9058b518b889ae98a8833b78 (diff) | |
Merge branch 'qa-257-instance-wide-saml-sso' into 'master'
Instance SAML SSO e2e test
Closes gitlab-qa#257
See merge request gitlab-org/gitlab-ce!22271
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/devise/shared/_omniauth_box.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/devise/shared/_omniauth_box.html.haml b/app/views/devise/shared/_omniauth_box.html.haml index 269a3721e06..12271ee5adb 100644 --- a/app/views/devise/shared/_omniauth_box.html.haml +++ b/app/views/devise/shared/_omniauth_box.html.haml @@ -5,7 +5,7 @@ .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', id: "oauth-login-#{provider}" do + = link_to omniauth_authorize_path(:user, provider), method: :post, class: 'btn d-flex align-items-center omniauth-btn text-left oauth-login qa-saml-login-button', id: "oauth-login-#{provider}" do - if has_icon = provider_image_tag(provider) %span |