Use enabled rather than enable to make gitlab.yml consistent

parent e9be0cc6
...@@ -624,9 +624,9 @@ production: &base ...@@ -624,9 +624,9 @@ production: &base
## GitLab Geo settings (EE-only) ## GitLab Geo settings (EE-only)
geo_primary_role: geo_primary_role:
enable: false enabled: false
geo_secondary_role: geo_secondary_role:
enable: false enabled: false
# #
# 5. Extra customization # 5. Extra customization
...@@ -712,9 +712,9 @@ test: ...@@ -712,9 +712,9 @@ test:
group_base: 'ou=groups,dc=example,dc=com' group_base: 'ou=groups,dc=example,dc=com'
admin_group: '' admin_group: ''
geo_primary_role: geo_primary_role:
enable: true enabled: true
geo_secondary_role: geo_secondary_role:
enable: true enabled: true
staging: staging:
<<: *base <<: *base
...@@ -343,9 +343,9 @@ Settings.pages['external_https'] ||= false unless Settings.pages['external_http ...@@ -343,9 +343,9 @@ Settings.pages['external_https'] ||= false unless Settings.pages['external_http
# #
Settings.gitlab['geo_status_timeout'] ||= 10 Settings.gitlab['geo_status_timeout'] ||= 10
Settings['geo_primary_role'] ||= Settingslogic.new({}) Settings['geo_primary_role'] ||= Settingslogic.new({})
Settings.geo_primary_role['enable'] = false if Settings.geo_primary_role['enable'].nil? Settings.geo_primary_role['enabled'] = false if Settings.geo_primary_role['enabled'].nil?
Settings['geo_secondary_role'] ||= Settingslogic.new({}) Settings['geo_secondary_role'] ||= Settingslogic.new({})
Settings.geo_secondary_role['enable'] = false if Settings.geo_secondary_role['enable'].nil? Settings.geo_secondary_role['enabled'] = false if Settings.geo_secondary_role['enabled'].nil?
# #
# Git LFS # Git LFS
......
...@@ -43,11 +43,11 @@ module Gitlab ...@@ -43,11 +43,11 @@ module Gitlab
end end
def self.primary_role_enabled? def self.primary_role_enabled?
Gitlab.config.geo_primary_role['enable'] Gitlab.config.geo_primary_role['enabled']
end end
def self.secondary_role_enabled? def self.secondary_role_enabled?
Gitlab.config.geo_secondary_role['enable'] Gitlab.config.geo_secondary_role['enabled']
end end
def self.license_allows? def self.license_allows?
......
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