summaryrefslogtreecommitdiff
path: root/config/gitlab.yml.example
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-04 15:07:36 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-04 15:07:36 +0000
commitaa542224bb345acf0cb9a1a606f0a802c16b0336 (patch)
tree496540a29aec55c6faeec7b0140824547046ae6c /config/gitlab.yml.example
parent2494b608a460c46c759ad84bb29e6cc3447499a1 (diff)
downloadgitlab-ce-aa542224bb345acf0cb9a1a606f0a802c16b0336.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/gitlab.yml.example')
-rw-r--r--config/gitlab.yml.example7
1 files changed, 7 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 94fd71aaa33..43e3315a870 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -467,6 +467,13 @@ production: &base
# enabled: true
# primary_api_url: http://localhost:5000/ # internal address to the primary registry, will be used by GitLab to directly communicate with primary registry API
+ ## Feature Flag https://docs.gitlab.com/ee/user/project/operations/feature_flags.html
+ feature_flags:
+ unleash:
+ # enabled: false
+ # url: https://gitlab.com/api/v4/feature_flags/unleash/<project_id>
+ # app_name: gitlab.com # Environment name of your GitLab instance
+ # instance_id: INSTANCE_ID
#
# 2. GitLab CI settings