diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 15:07:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 15:07:43 +0300 |
| commit | 39fa7d1eeb2dba52f0601128f3ac91f57d19866e (patch) | |
| tree | da042d34ff762dd1957e51666a34202295a081b9 /config/initializers/1_settings.rb | |
| parent | 6ac4a6713ed3196af899011f7e18658e16ebaac0 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers/1_settings.rb')
| -rw-r--r-- | config/initializers/1_settings.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 79bfcfd79e1..f31762d9ac6 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -370,6 +370,14 @@ Gitlab.ee do end # +# Terraform state +# +Settings['terraform_state'] ||= Settingslogic.new({}) +Settings.terraform_state['enabled'] = true if Settings.terraform_state['enabled'].nil? +Settings.terraform_state['storage_path'] = Settings.absolute(Settings.terraform_state['storage_path'] || File.join(Settings.shared['path'], "terraform_state")) +Settings.terraform_state['object_store'] = ObjectStoreSettings.parse(Settings.terraform_state['object_store']) + +# # Mattermost # Settings['mattermost'] ||= Settingslogic.new({}) |