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
Léo-Paul Géneau
gitlab-ce
Commits
76329a46
Commit
76329a46
authored
Jan 16, 2013
by
Riyad Preukschas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix settings
parent
eea43c94
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
11 deletions
+14
-11
config/gitlab.yml.example
config/gitlab.yml.example
+11
-8
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+3
-3
No files found.
config/gitlab.yml.example
View file @
76329a46
...
...
@@ -18,10 +18,13 @@ gitlab:
host: localhost
port: 80
https: false
#
u
ncomment and customize to run in non-root path
#
n
ote that ENV['RAILS_RELATIVE_URL_ROOT'] in config/unicorn.rb may need to be changed
#
U
ncomment and customize to run in non-root path
#
N
ote that ENV['RAILS_RELATIVE_URL_ROOT'] in config/unicorn.rb may need to be changed
# relative_url_root: /gitlab
# Uncomment and customize if you can't use the default user to run GitLab (default: 'gitlab')
# user: user123
## Email settings
# Email address used in the "From" field in mails sent by GitLab
email_from: gitlab@localhost
...
...
@@ -29,9 +32,6 @@ gitlab:
## Project settings
default_projects_limit: 10
## Account used for GitLab installation ('gitlab' if undefined)
user: gitlab
## Gravatar
gravatar:
enabled: true # Use user avatar images from Gravatar.com (default: true)
...
...
@@ -88,8 +88,9 @@ omniauth:
# ==========================
# GitLab Satellites
satellites:
path: /home/gitlab/gitlab-satellites/
satellites:
# Relative paths are relative to Rails.root (default: tmp/repo_satellites/)
path: /home/gitlab/gitlab-satellites/
## Backup settings
backup:
...
...
@@ -107,10 +108,12 @@ gitolite:
receive_pack: true
ssh_user: git
ssh_host: localhost
group: git # default: 'git' if undefined
# ssh_port: 22
# config_file: gitolite.conf
# Uncomment and customize if you can't use the default group to own the repositories and run Gitolite (default: same as the 'ssh_user' above)
# owner_group: group123
## Git settings
# CAUTION!
# Use the default values unless you really know what you are doing
...
...
config/initializers/1_settings.rb
View file @
76329a46
...
...
@@ -50,7 +50,7 @@ Settings.gitlab['relative_url_root'] ||= ''
Settings
.
gitlab
[
'protocol'
]
||=
Settings
.
gitlab
.
https
?
"https"
:
"http"
Settings
.
gitlab
[
'email_from'
]
||=
"gitlab@
#{
Settings
.
gitlab
.
host
}
"
Settings
.
gitlab
[
'url'
]
||=
Settings
.
send
(
:build_gitlab_url
)
Settings
.
gitlab
[
'user'
]
||=
'gitlab'
Settings
.
gitlab
[
'user'
]
||=
'gitlab'
Settings
[
'gravatar'
]
||=
Settingslogic
.
new
({})
Settings
.
gravatar
[
'enabled'
]
||=
true
...
...
@@ -68,7 +68,7 @@ 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'
Settings
.
gitolite
[
'
group'
]
||=
'git'
Settings
.
gitolite
[
'
owner_group'
]
||=
Settings
.
gitolite
.
ssh_user
Settings
.
gitolite
[
'ssh_path_prefix'
]
||=
Settings
.
send
(
:build_gitolite_ssh_path_prefix
)
Settings
[
'backup'
]
||=
Settingslogic
.
new
({})
...
...
@@ -81,4 +81,4 @@ Settings.git['bin_path'] ||= '/usr/bin/git'
Settings
.
git
[
'timeout'
]
||=
10
Settings
[
'satellites'
]
||=
Settingslogic
.
new
({})
Settings
.
satellites
[
'path'
]
||=
Rails
.
root
.
join
(
'tmp/repo_satellites/'
)
Settings
.
satellites
[
'path'
]
=
File
.
expand_path
(
Settings
.
satellites
[
'path'
]
||
"tmp/repo_satellites/"
,
Rails
.
root
)
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