diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-23 18:09:16 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-23 18:09:16 +0000 |
| commit | f6b95a66bc12adeb4fac7277d1eb345d9e7819fd (patch) | |
| tree | b2739bb34529d005a356df12da50c0e38caf6a52 /config | |
| parent | b465b2440bbf8ac8c4ef21728ab14fb48589057c (diff) | |
| download | gitlab-ce-f6b95a66bc12adeb4fac7277d1eb345d9e7819fd.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/unlink_fork_network_upon_visibility_decrease.yml | 8 | ||||
| -rw-r--r-- | config/initializers/7_redis.rb | 1 |
2 files changed, 1 insertions, 8 deletions
diff --git a/config/feature_flags/development/unlink_fork_network_upon_visibility_decrease.yml b/config/feature_flags/development/unlink_fork_network_upon_visibility_decrease.yml deleted file mode 100644 index e7e220c310b..00000000000 --- a/config/feature_flags/development/unlink_fork_network_upon_visibility_decrease.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: unlink_fork_network_upon_visibility_decrease -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/20466 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/369438 -milestone: '12.6' -type: development -group: group::source code -default_enabled: true diff --git a/config/initializers/7_redis.rb b/config/initializers/7_redis.rb index 7773740fec4..85dee02cf01 100644 --- a/config/initializers/7_redis.rb +++ b/config/initializers/7_redis.rb @@ -5,6 +5,7 @@ require 'gitlab/redis' Redis.raise_deprecations = true unless Rails.env.production? Redis::Client.prepend(Gitlab::Instrumentation::RedisInterceptor) +Redis::Cluster::NodeLoader.prepend(Gitlab::Patch::NodeLoader) # Make sure we initialize a Redis connection pool before multi-threaded # execution starts by |