diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-02 15:18:59 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-02 15:18:59 -0800 |
| commit | 12581f15eeb7b60e966c89642233bb2a1d9306ee (patch) | |
| tree | 2d32052d9549c4d290f8b5e4b95050871dc1b260 /app/views/devise/sessions | |
| parent | e39bf83770fe804112eef6e3d8651994d506a740 (diff) | |
| parent | 252ee4e7e51ae18f30f4b9089be850daaca958ac (diff) | |
| download | gitlab-ce-12581f15eeb7b60e966c89642233bb2a1d9306ee.tar.gz | |
Merge pull request #7473 from sodabrew/patch-1
Improve login screen when only OmniAuth providers are enabled
Diffstat (limited to 'app/views/devise/sessions')
| -rw-r--r-- | app/views/devise/sessions/new.html.haml | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml index fa2460518fc..89e4e229ac0 100644 --- a/app/views/devise/sessions/new.html.haml +++ b/app/views/devise/sessions/new.html.haml @@ -1,6 +1,18 @@ %div - = render 'devise/shared/signin_box' + - if signin_enabled? || ldap_enabled? + = render 'devise/shared/signin_box' - - if signup_enabled? + -# Omniauth fits between signin/ldap signin and signup and does not have a surrounding box + - if Gitlab.config.omniauth.enabled && devise_mapping.omniauthable? + .clearfix.prepend-top-20 + = render 'devise/shared/omniauth_box' + + -# Signup only makes sense if you can also sign-in + - if signin_enabled? && signup_enabled? .prepend-top-20 = render 'devise/shared/signup_box' + + -# Show a message if none of the mechanisms above are enabled + - if !signin_enabled? && !ldap_enabled? && !(Gitlab.config.omniauth.enabled && devise_mapping.omniauthable?) + %div + No authentication methods configured. |