diff options
Diffstat (limited to 'config/initializers/omniauth.rb')
| -rw-r--r-- | config/initializers/omniauth.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index 478a5828809..24040d7b076 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -11,7 +11,15 @@ if Gitlab::Auth::Ldap::Config.enabled? end end -OmniAuth.config.full_host = Settings.gitlab['base_url'] +OmniAuth.config.full_host = + if Feature.feature_flags_available? && ::Feature.enabled?(:omniauth_initializer_fullhost_proc, default_enabled: :yaml) + Gitlab::AppLogger.debug("Using OmniAuth proc initializer") + Gitlab::OmniauthInitializer.full_host + else + Gitlab::AppLogger.debug("Fallback to OmniAuth static full_host") + Settings.gitlab['base_url'] + end + OmniAuth.config.allowed_request_methods = [:post] # In case of auto sign-in, the GET method is used (users don't get to click on a button) OmniAuth.config.allowed_request_methods << :get if Gitlab.config.omniauth.auto_sign_in_with_provider.present? |