diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-04 15:07:36 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-04 15:07:36 +0000 |
| commit | aa542224bb345acf0cb9a1a606f0a802c16b0336 (patch) | |
| tree | 496540a29aec55c6faeec7b0140824547046ae6c /config/initializers/1_settings.rb | |
| parent | 2494b608a460c46c759ad84bb29e6cc3447499a1 (diff) | |
| download | gitlab-ce-aa542224bb345acf0cb9a1a606f0a802c16b0336.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers/1_settings.rb')
| -rw-r--r-- | config/initializers/1_settings.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 5e94a0716fa..12ba56a15e9 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -309,6 +309,13 @@ Gitlab.ee do 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 # Settings['external_diffs'] ||= Settingslogic.new({}) |