Add latest changes from gitlab-org/gitlab@master

3 files changed, 25 insertions, 8 deletions

diff --git a/config/feature_flags/development/ci_includable_files_interpolation.yml b/config/feature_flags/development/ci_includable_files_interpolation.yml
deleted file mode 100644
index 7a6eef0f27c..00000000000
--- a/config/feature_flags/development/ci_includable_files_interpolation.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_includable_files_interpolation
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/113211
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/399146
-milestone: '15.11'
-type: development
-group: group::pipeline authoring
-default_enabled: true
diff --git a/config/feature_flags/experiment/phone_verification_for_low_risk_users.yml b/config/feature_flags/experiment/phone_verification_for_low_risk_users.yml
new file mode 100644
index 00000000000..9e4b76980b7
--- /dev/null
+++ b/config/feature_flags/experiment/phone_verification_for_low_risk_users.yml
@@ -0,0 +1,8 @@
+---
+name: phone_verification_for_low_risk_users
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124090
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/415674
+milestone: '16.2'
+type: experiment
+group: group::anti-abuse
+default_enabled: false
diff --git a/config/initializers/7_redis.rb b/config/initializers/7_redis.rb
index 61b660ec6a3..b66a5e70f56 100644
--- a/config/initializers/7_redis.rb
+++ b/config/initializers/7_redis.rb
@@ -4,6 +4,23 @@ require 'gitlab/redis'
 
 Redis.raise_deprecations = true unless Rails.env.production?
 
+# rubocop:disable Gitlab/NoCodeCoverageComment
+# :nocov: This snippet is for local development only, reloading in specs would raise NameError
+if Rails.env.development?
+  # reset all pools in the event of a reload
+  # This makes sure that there are no stale references to classes in the `Gitlab::Redis` namespace
+  # that also got reloaded.
+  Gitlab::Application.config.to_prepare do
+    Gitlab::Redis::ALL_CLASSES.each do |redis_instance|
+      redis_instance.instance_variable_set(:@pool, nil)
+    end
+
+    Rails.cache = ActiveSupport::Cache::RedisCacheStore.new(**Gitlab::Redis::Cache.active_support_config)
+  end
+end
+# :nocov:
+# rubocop:enable Gitlab/NoCodeCoverageComment
+
 Redis::Client.prepend(Gitlab::Instrumentation::RedisInterceptor)
 Redis::Cluster::NodeLoader.prepend(Gitlab::Patch::NodeLoader)
 Redis::Cluster.prepend(Gitlab::Patch::RedisCluster)