summaryrefslogtreecommitdiff
path: root/lib/feature.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-07-29 15:09:48 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-07-29 15:09:48 +0000
commitf4d51a9f71cf3d4b0874a3e1948fe3c1ea193c4d (patch)
tree7ae3da76e824c435167dd108721c0124ad2ee484 /lib/feature.rb
parent2dedd78ef505a0ab0a379c7340a3fcba56ada663 (diff)
downloadgitlab-ce-f4d51a9f71cf3d4b0874a3e1948fe3c1ea193c4d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/feature.rb')
-rw-r--r--lib/feature.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/feature.rb b/lib/feature.rb
index 453ecc8255a..26dbdd53968 100644
--- a/lib/feature.rb
+++ b/lib/feature.rb
@@ -36,7 +36,7 @@ class Feature
end
def persisted_names
- return [] unless Gitlab::Database.exists?
+ return [] unless Gitlab::Database.main.exists?
# This loads names of all stored feature flags
# and returns a stable Set in the following order:
@@ -73,7 +73,7 @@ class Feature
# During setup the database does not exist yet. So we haven't stored a value
# for the feature yet and return the default.
- return default_enabled unless Gitlab::Database.exists?
+ return default_enabled unless Gitlab::Database.main.exists?
feature = get(key)