diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
| commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
| tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /config/initializers/omniauth.rb | |
| parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) | |
| download | gitlab-ce-3cccd102ba543e02725d247893729e5c73b38295.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
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? |