summaryrefslogtreecommitdiff
path: root/lib/feature
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-09 15:08:47 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-09 15:08:47 +0000
commit825e4190a30a745adb37ab822eb8f9d845b462e7 (patch)
tree2588f929e0dc2bd97bf9b57eee596ae65315144c /lib/feature
parentd022b7432efd720f0cf5f8d2a2cdaac7619bab57 (diff)
downloadgitlab-ce-825e4190a30a745adb37ab822eb8f9d845b462e7.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/feature')
-rw-r--r--lib/feature/shared.rb14
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/feature/shared.rb b/lib/feature/shared.rb
index 14efbb07100..53f027e3893 100644
--- a/lib/feature/shared.rb
+++ b/lib/feature/shared.rb
@@ -15,8 +15,18 @@ class Feature
optional: true,
rollout_issue: true,
example: <<-EOS
- Feature.enabled?(:my_feature_flag)
- Feature.enabled?(:my_feature_flag, type: :development)
+ Feature.enabled?(:my_feature_flag, project)
+ Feature.enabled?(:my_feature_flag, project, type: :development)
+ push_frontend_feature_flag?(:my_feature_flag, project)
+ EOS
+ },
+ ops: {
+ description: "Long-lived feature flags that control operational aspects of GitLab's behavior",
+ optional: true,
+ rollout_issue: false,
+ example: <<-EOS
+ Feature.enabled?(:my_ops_flag, type: ops)
+ push_frontend_feature_flag?(:my_ops_flag, project, type: :ops)
EOS
}
}.freeze