Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-12-21 06:09:42 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-12-21 06:09:42 +0300
commit6f2278bd4a548e432b0429a9576ab896460941b2 (patch)
treebde1d0166a3420c820a6a91fdb2fe6258215ce92 /lib/gitlab/redis
parent7b0db0ccfbec6155d68fc2b7b55a38245f97580c (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/redis')
-rw-r--r--lib/gitlab/redis/multi_store.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/redis/multi_store.rb b/lib/gitlab/redis/multi_store.rb
index 4f58bee49d0..ffb9cf2b9de 100644
--- a/lib/gitlab/redis/multi_store.rb
+++ b/lib/gitlab/redis/multi_store.rb
@@ -175,7 +175,7 @@ module Gitlab
# @return [Boolean]
def feature_enabled?(prefix)
feature_table_exists? &&
- Feature.enabled?("#{prefix}_#{instance_name.underscore}") &&
+ Feature.enabled?("#{prefix}_#{instance_name.underscore}") && # rubocop:disable Cop/FeatureFlagUsage
!same_redis_store?
end