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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
b07e1b3a
Commit
b07e1b3a
authored
Jan 17, 2013
by
Riyad Preukschas
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2653 from jouve/fix_default_settings
Fix default settings when they are boolean.
parents
bf753e99
9db7c16a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+6
-6
No files found.
config/initializers/1_settings.rb
View file @
b07e1b3a
...
...
@@ -35,16 +35,16 @@ end
# Default settings
Settings
[
'ldap'
]
||=
Settingslogic
.
new
({})
Settings
.
ldap
[
'enabled'
]
||=
false
Settings
.
ldap
[
'enabled'
]
=
false
if
Settings
.
ldap
[
'enabled'
].
nil?
Settings
[
'omniauth'
]
||=
Settingslogic
.
new
({})
Settings
.
omniauth
[
'enabled'
]
||=
false
Settings
.
omniauth
[
'enabled'
]
=
false
if
Settings
.
omniauth
[
'enabled'
].
nil?
Settings
.
omniauth
[
'providers'
]
||=
[]
Settings
[
'gitlab'
]
||=
Settingslogic
.
new
({})
Settings
.
gitlab
[
'default_projects_limit'
]
||=
10
Settings
.
gitlab
[
'host'
]
||=
'localhost'
Settings
.
gitlab
[
'https'
]
||=
false
Settings
.
gitlab
[
'https'
]
=
false
if
Settings
.
gitlab
[
'https'
].
nil?
Settings
.
gitlab
[
'port'
]
||=
Settings
.
gitlab
.
https
?
443
:
80
Settings
.
gitlab
[
'relative_url_root'
]
||=
''
Settings
.
gitlab
[
'protocol'
]
||=
Settings
.
gitlab
.
https
?
"https"
:
"http"
...
...
@@ -53,7 +53,7 @@ Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url)
Settings
.
gitlab
[
'user'
]
||=
'gitlab'
Settings
[
'gravatar'
]
||=
Settingslogic
.
new
({})
Settings
.
gravatar
[
'enabled'
]
||=
true
Settings
.
gravatar
[
'enabled'
]
=
true
if
Settings
.
gravatar
[
'enabled'
].
nil?
Settings
.
gravatar
[
'plain_url'
]
||=
'http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm'
Settings
.
gravatar
[
'ssl_url'
]
||=
'https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm'
...
...
@@ -62,9 +62,9 @@ Settings.gitolite['admin_key'] ||= 'gitlab'
Settings
.
gitolite
[
'admin_uri'
]
||=
'git@localhost:gitolite-admin'
Settings
.
gitolite
[
'config_file'
]
||=
'gitolite.conf'
Settings
.
gitolite
[
'hooks_path'
]
||=
'/home/git/share/gitolite/hooks/'
Settings
.
gitolite
[
'receive_pack'
]
||=
(
Settings
.
gitolite
[
'receive_pack'
]
!=
false
)
Settings
.
gitolite
[
'receive_pack'
]
=
true
if
Settings
.
gitolite
[
'receive_pack'
].
nil?
Settings
.
gitolite
[
'upload_pack'
]
=
true
if
Settings
.
gitolite
[
'upload_pack'
].
nil?
Settings
.
gitolite
[
'repos_path'
]
||=
'/home/git/repositories/'
Settings
.
gitolite
[
'upload_pack'
]
||=
(
Settings
.
gitolite
[
'upload_pack'
]
!=
false
)
Settings
.
gitolite
[
'ssh_host'
]
||=
(
Settings
.
gitlab
.
host
||
'localhost'
)
Settings
.
gitolite
[
'ssh_port'
]
||=
22
Settings
.
gitolite
[
'ssh_user'
]
||=
'git'
...
...
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