Commit b56567dd authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'unleash-client-config' into 'master'

Add Unleash Client Settings to gitlab.yml.example

See merge request gitlab-org/gitlab!18606
parents f4271aff b38e7b8d
...@@ -467,6 +467,13 @@ production: &base ...@@ -467,6 +467,13 @@ production: &base
# enabled: true # 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 # 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 # 2. GitLab CI settings
......
...@@ -308,6 +308,13 @@ Gitlab.ee do ...@@ -308,6 +308,13 @@ Gitlab.ee do
Settings.geo.registry_replication['enabled'] ||= false Settings.geo.registry_replication['enabled'] ||= false
end end
#
# Unleash
#
Settings['feature_flags'] ||= Settingslogic.new({})
Settings.feature_flags['unleash'] ||= Settingslogic.new({})
Settings.feature_flags.unleash['enabled'] = false if Settings.feature_flags.unleash['enabled'].nil?
# #
# External merge request diffs # External merge request diffs
# #
......
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