forked from External/greenlight
GRN2-xx: Users, Room and Recordings are now no longer permanently deleted (#773)
* Bug fixes for 2.4 * Removed accidental code add * Switched from deleting to tombstoning * Fixed bug with login
This commit is contained in:
@ -30,7 +30,6 @@ class SessionsController < ApplicationController
|
||||
def signin
|
||||
check_if_twitter_account
|
||||
|
||||
providers = configured_providers
|
||||
if one_provider
|
||||
provider_path = if Rails.configuration.omniauth_ldap
|
||||
ldap_signin_path
|
||||
@ -147,6 +146,8 @@ class SessionsController < ApplicationController
|
||||
end
|
||||
|
||||
def one_provider
|
||||
providers = configured_providers
|
||||
|
||||
(!allow_user_signup? || !allow_greenlight_accounts?) && providers.count == 1 &&
|
||||
!Rails.configuration.loadbalanced_configuration
|
||||
end
|
||||
|
Reference in New Issue
Block a user