Show Crowd login even when sign-in is disabled

dcaeee45 · Peter Hudec · Rémy Coutable · 06f7fd2f · dcaeee45 · dcaeee45
Commit dcaeee45 authored Feb 04, 2016 by Peter Hudec Committed by Rémy Coutable Feb 23, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

CHANGELOG CHANGELOG +1 -0

app/views/devise/sessions/new.html.haml app/views/devise/sessions/new.html.haml +1 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
 Please view this file on the master branch, on stable branches it's out of date.
 v 8.6.0 (unreleased)
+  - Show Crowd login tab when sign in is disabled and Crowd is enabled (Peter Hudec)
 v 8.5.0
  - Fix duplicate "me" in tooltip of the "thumbsup" awards Emoji (Stan Hu)

--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
 - page_title "Sign in"
 %div
-  - if signin_enabled? || ldap_enabled?
+  - if signin_enabled? || ldap_enabled? || crowd_enabled?
    = render 'devise/shared/signin_box'
  -# Omniauth fits between signin/ldap signin and signup and does not have a surrounding box