Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-07-05 19:01:40 +0300
committerSean McGivern <sean@mcgivern.me.uk>2017-07-05 19:01:40 +0300
commit8a3022a69826272fb5eb111c016770965a5484b3 (patch)
tree8e5afc578cafc1727125864be47dd393bd17fe4c /app/views/devise
parentd9a5d9214002a2895aaf0c598bef985b2b4ddc57 (diff)
Revert "Merge branch '18000-remember-me-for-oauth-login' into 'master'"
This reverts merge request !11963
Diffstat (limited to 'app/views/devise')
-rw-r--r--app/views/devise/shared/_omniauth_box.html.haml5
1 files changed, 1 insertions, 4 deletions
diff --git a/app/views/devise/shared/_omniauth_box.html.haml b/app/views/devise/shared/_omniauth_box.html.haml
index e80d10dc8f1..f92f89e73ff 100644
--- a/app/views/devise/shared/_omniauth_box.html.haml
+++ b/app/views/devise/shared/_omniauth_box.html.haml
@@ -6,7 +6,4 @@
- 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: 'oauth-login' + (has_icon ? ' oauth-image-link' : ' btn'), id: "oauth-login-#{provider}"
- %fieldset
- = check_box_tag :remember_me
- = label_tag :remember_me, 'Remember Me'
+ = link_to provider_image_tag(provider), omniauth_authorize_path(:user, provider), method: :post, class: (has_icon ? 'oauth-image-link' : 'btn')