diff options
Diffstat (limited to 'config')
3 files changed, 17 insertions, 1 deletions
diff --git a/config/feature_flags/development/ci_minimal_cost_factor_for_gitlab_contributors.yml b/config/feature_flags/development/ci_minimal_cost_factor_for_gitlab_contributors.yml new file mode 100644 index 00000000000..e571abdc97f --- /dev/null +++ b/config/feature_flags/development/ci_minimal_cost_factor_for_gitlab_contributors.yml @@ -0,0 +1,8 @@ +--- +name: ci_minimal_cost_factor_for_gitlab_contributors +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89742 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365862 +milestone: '15.2' +type: development +group: group::pipeline execution +default_enabled: false diff --git a/config/feature_flags/ops/ci_minimal_cost_factor_for_gitlab_namespaces.yml b/config/feature_flags/ops/ci_minimal_cost_factor_for_gitlab_namespaces.yml new file mode 100644 index 00000000000..fbbd4d9672b --- /dev/null +++ b/config/feature_flags/ops/ci_minimal_cost_factor_for_gitlab_namespaces.yml @@ -0,0 +1,8 @@ +--- +name: ci_minimal_cost_factor_for_gitlab_namespaces +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89742 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/367692 +milestone: '15.2' +type: ops +group: group::pipeline execution +default_enabled: false diff --git a/config/routes/user.rb b/config/routes/user.rb index a5fc53b61d2..96e8c850da4 100644 --- a/config/routes/user.rb +++ b/config/routes/user.rb @@ -15,7 +15,7 @@ end # Use custom controller for LDAP omniauth callback if Gitlab::Auth::Ldap::Config.sign_in_enabled? devise_scope :user do - Gitlab::Auth::Ldap::Config.available_servers.each do |server| + Gitlab::Auth::Ldap::Config.servers.each do |server| override_omniauth(server['provider_name'], 'ldap/omniauth_callbacks') end end |