diff options
| author | Peter Hudec <hudecof@hudecof.net> | 2016-02-04 07:32:48 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-02-23 15:13:50 +0100 |
| commit | dcaeee45790480210cf241d5dfead86803fa16a7 (patch) | |
| tree | 5b6c929ff657eba4096c53b018a7392ec3140af1 | |
| parent | 06f7fd2fb75293ca2bfeb36dd0552d88a8ca855a (diff) | |
| download | gitlab-ce-dcaeee45790480210cf241d5dfead86803fa16a7.tar.gz | |
Show Crowd login even when sign-in is disabled
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/devise/sessions/new.html.haml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 7fcb4628058..d3280c5d0a1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ 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) diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml index dbc8eda6196..1136afbf29c 100644 --- a/app/views/devise/sessions/new.html.haml +++ b/app/views/devise/sessions/new.html.haml @@ -1,6 +1,6 @@ - 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 |