diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-18 21:11:20 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-18 21:11:20 +0300 |
commit | b53f92660977ebc05433e9bbeb74e3c4c6bf0194 (patch) | |
tree | 9182728ebbbc96b7511918c288a2995055bea1c8 /lib/gitlab/sourcegraph.rb | |
parent | da975941d13188324266a50d3f8c0292690ee437 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/sourcegraph.rb')
-rw-r--r-- | lib/gitlab/sourcegraph.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/gitlab/sourcegraph.rb b/lib/gitlab/sourcegraph.rb index 7ef6ab32bd4..892c4468107 100644 --- a/lib/gitlab/sourcegraph.rb +++ b/lib/gitlab/sourcegraph.rb @@ -8,13 +8,14 @@ module Gitlab end def feature_available? - # The sourcegraph_bundle feature could be conditionally applied, so check if `!off?` - !feature.off? + # The sourcegraph feature could be conditionally applied, so check if `!off?` + # We also can't just check !off? because the ActiveRecord might not exist yet + self.feature_enabled? || !feature.off? end def feature_enabled?(actor = nil) # Some CI jobs grep for Feature.enabled? in our codebase, so it is important this reference stays around. - Feature.enabled?(:sourcegraph, actor) + Feature.enabled?(:sourcegraph, actor, default_enabled: :yaml) end private |