diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-05 15:41:06 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-05 15:41:06 +0300 |
| commit | 6df61942e9b42fe6a733606b89f3f16f3b20f1e2 (patch) | |
| tree | 3c5fa8fcda092a97c842f2dc5ba922b7cf64477a /app/views/devise | |
| parent | 3f0e37f6d41ebca5dd63b955e1375df17a23b190 (diff) | |
| parent | 2ae8158c8c1ac6add71b4f3ef8738c5919bdca4e (diff) | |
Merge branch '18000-remember-me-for-oauth-login' into 'master'
Honor the "Remember me" parameter for OAuth-based login
Closes #18000
See merge request !11963
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' |