Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
901deb24
Commit
901deb24
authored
May 30, 2017
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use enabled rather than enable to make gitlab.yml consistent
parent
e9be0cc6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
config/gitlab.yml.example
config/gitlab.yml.example
+4
-4
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+2
-2
lib/gitlab/geo.rb
lib/gitlab/geo.rb
+2
-2
No files found.
config/gitlab.yml.example
View file @
901deb24
...
...
@@ -624,9 +624,9 @@ production: &base
## GitLab Geo settings (EE-only)
geo_primary_role:
enable: false
enable
d
: false
geo_secondary_role:
enable: false
enable
d
: false
#
# 5. Extra customization
...
...
@@ -712,9 +712,9 @@ test:
group_base: 'ou=groups,dc=example,dc=com'
admin_group: ''
geo_primary_role:
enable: true
enable
d
: true
geo_secondary_role:
enable: true
enable
d
: true
staging:
<<: *base
config/initializers/1_settings.rb
View file @
901deb24
...
...
@@ -343,9 +343,9 @@ Settings.pages['external_https'] ||= false unless Settings.pages['external_http
#
Settings
.
gitlab
[
'geo_status_timeout'
]
||=
10
Settings
[
'geo_primary_role'
]
||=
Settingslogic
.
new
({})
Settings
.
geo_primary_role
[
'enable
'
]
=
false
if
Settings
.
geo_primary_role
[
'enable
'
].
nil?
Settings
.
geo_primary_role
[
'enable
d'
]
=
false
if
Settings
.
geo_primary_role
[
'enabled
'
].
nil?
Settings
[
'geo_secondary_role'
]
||=
Settingslogic
.
new
({})
Settings
.
geo_secondary_role
[
'enable
'
]
=
false
if
Settings
.
geo_secondary_role
[
'enable
'
].
nil?
Settings
.
geo_secondary_role
[
'enable
d'
]
=
false
if
Settings
.
geo_secondary_role
[
'enabled
'
].
nil?
#
# Git LFS
...
...
lib/gitlab/geo.rb
View file @
901deb24
...
...
@@ -43,11 +43,11 @@ module Gitlab
end
def
self
.
primary_role_enabled?
Gitlab
.
config
.
geo_primary_role
[
'enable'
]
Gitlab
.
config
.
geo_primary_role
[
'enable
d
'
]
end
def
self
.
secondary_role_enabled?
Gitlab
.
config
.
geo_secondary_role
[
'enable'
]
Gitlab
.
config
.
geo_secondary_role
[
'enable
d
'
]
end
def
self
.
license_allows?
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment