Commit 49ed45ff authored by Shinya Maeda's avatar Shinya Maeda

Merge branch 'migrate-feature-flags-to-be-ops' into 'master'

Migrate `marginalia` feature flags to be ops

See merge request gitlab-org/gitlab!45142
parents 509b35ce 80eb3f39
...@@ -3,5 +3,5 @@ name: marginalia ...@@ -3,5 +3,5 @@ name: marginalia
introduced_by_url: introduced_by_url:
rollout_issue_url: rollout_issue_url:
group: group:
type: development type: ops
default_enabled: false default_enabled: false
...@@ -18,7 +18,7 @@ module Gitlab ...@@ -18,7 +18,7 @@ module Gitlab
# During db:create and db:bootstrap skip feature query as DB is not available yet. # During db:create and db:bootstrap skip feature query as DB is not available yet.
return false unless Gitlab::Database.cached_table_exists?('features') return false unless Gitlab::Database.cached_table_exists?('features')
self.enabled = Feature.enabled?(:marginalia) self.enabled = Feature.enabled?(:marginalia, type: :ops)
end end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment