diff options
| -rw-r--r-- | config/initializers/omniauth.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index f7fa6d1c2de..90d79bae466 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -9,6 +9,13 @@ if Gitlab::LDAP::Config.enabled? server = Gitlab.config.ldap.servers.values.first alias_method server['provider_name'], :ldap end + + # We need to make sure we require the sessions controller _after_ we defined the + # nescessary LDAP-strategy classes. + # + # If we don't then the token gets cleared out at some point. + # + require Rails.root.join('app', 'controllers', 'sessions_controller') end OmniAuth.config.full_host = Settings.gitlab['base_url'] |