diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-20 11:55:55 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-20 11:55:55 +0000 |
| commit | 4f167ea00e7bf30416e83fc12d2f1aaa74f603b7 (patch) | |
| tree | 50668603ce1afd292b7aefe3f05f387c73603fdd | |
| parent | 303d131102d84dfc4514c575e9e41de3de6ea76e (diff) | |
| parent | 622bbf9629d2f5f081fbad6bbd9f0e3b6f092be6 (diff) | |
| download | gitlab-ce-4f167ea00e7bf30416e83fc12d2f1aaa74f603b7.tar.gz | |
Merge branch 'oauth-require-public-email' into 'master'
Oauth Require Public Email
Does not fix #976 yet, but will reduce the amount of users getting 422 immensly.
| -rw-r--r-- | app/views/devise/sessions/_oauth_providers.html.haml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/devise/sessions/_oauth_providers.html.haml b/app/views/devise/sessions/_oauth_providers.html.haml index 935bc6af505..2b1cb9c694f 100644 --- a/app/views/devise/sessions/_oauth_providers.html.haml +++ b/app/views/devise/sessions/_oauth_providers.html.haml @@ -2,10 +2,12 @@ - if providers.present? %hr %div{:'data-no-turbolink' => 'data-no-turbolink'} - %span Sign in with: + %span Sign in with*: - providers.each do |provider| %span - if default_providers.include?(provider) = link_to authbutton(provider, 32), omniauth_authorize_path(resource_name, provider) - else = link_to provider.to_s.titleize, omniauth_authorize_path(resource_name, provider), class: "btn" + %br + %small * Make sure your email address is public |