diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-07-06 15:59:21 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-07-06 15:59:21 +0300 |
| commit | a33fb2132cc9c1924fe986ce562cd7bea084a5c9 (patch) | |
| tree | 93fc06817bd2b068b96e1b5813966d8e4b75b234 /app/views/devise | |
| parent | d6836a3bc66662618efdd4f86969bdfd0904aca8 (diff) | |
| parent | 89b0c987fcba5692842f83cfaba90a9004ac91de (diff) | |
Merge branch '18000-remember-me-for-oauth-login' into 'master'
Fix `migration:path` build for "Honor the 'Remember me' parameter for OAuth-based login"
Closes #34713
See merge request !12668
Diffstat (limited to 'app/views/devise')
| -rw-r--r-- | app/views/devise/shared/_omniauth_box.html.haml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/devise/shared/_omniauth_box.html.haml b/app/views/devise/shared/_omniauth_box.html.haml index f92f89e73ff..e80d10dc8f1 100644 --- a/app/views/devise/shared/_omniauth_box.html.haml +++ b/app/views/devise/shared/_omniauth_box.html.haml @@ -6,4 +6,7 @@ - providers.each do |provider| %span.light - has_icon = provider_has_icon?(provider) - = link_to provider_image_tag(provider), omniauth_authorize_path(:user, provider), method: :post, class: (has_icon ? 'oauth-image-link' : 'btn') + = link_to provider_image_tag(provider), omniauth_authorize_path(:user, provider), method: :post, class: 'oauth-login' + (has_icon ? ' oauth-image-link' : ' btn'), id: "oauth-login-#{provider}" + %fieldset + = check_box_tag :remember_me + = label_tag :remember_me, 'Remember Me' |