diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-26 21:08:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-26 21:08:09 +0300 |
| commit | f52b15b6398075127f4c583823fd72d4a6ec5e59 (patch) | |
| tree | bab517b3e2864acb1f158639acdf0a341e5ed43a /config | |
| parent | cac0926ddbef9d1505c2a23ccad60fd47c7d050a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
3 files changed, 1 insertions, 24 deletions
diff --git a/config/feature_flags/development/container_security_policy_selection.yml b/config/feature_flags/development/container_security_policy_selection.yml deleted file mode 100644 index e2407195ffc..00000000000 --- a/config/feature_flags/development/container_security_policy_selection.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: container_security_policy_selection -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80272 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353071 -milestone: '14.10' -type: development -group: group::container security -default_enabled: true diff --git a/config/feature_flags/development/omniauth_initializer_fullhost_proc.yml b/config/feature_flags/development/omniauth_initializer_fullhost_proc.yml deleted file mode 100644 index 52743818b5a..00000000000 --- a/config/feature_flags/development/omniauth_initializer_fullhost_proc.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: omniauth_initializer_fullhost_proc -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82703 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/355579 -milestone: '14.10' -type: development -group: group::geo -default_enabled: true diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index 2c7034f758d..38bd1034b36 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -11,14 +11,7 @@ if Gitlab::Auth::Ldap::Config.enabled? end end -OmniAuth.config.full_host = - if Feature.feature_flags_available? && ::Feature.enabled?(:omniauth_initializer_fullhost_proc) - 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.full_host = Gitlab::OmniauthInitializer.full_host 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) |