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
Jérome Perrin
gitlab-ce
Commits
0d4568db
Commit
0d4568db
authored
12 years ago
by
Valeriy Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gitolite custom config
parent
be4138af
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
1 deletion
+9
-1
config/gitlab.yml.example
config/gitlab.yml.example
+1
-0
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+4
-0
lib/gitlab/backend/gitolite_config.rb
lib/gitlab/backend/gitolite_config.rb
+4
-1
No files found.
config/gitlab.yml.example
View file @
0d4568db
...
...
@@ -74,6 +74,7 @@ git_host:
upload_pack: true
receive_pack: true
# host: localhost
# config_file: gitolite.conf
# port: 22
# Git settings
...
...
This diff is collapsed.
Click to expand it.
config/initializers/1_settings.rb
View file @
0d4568db
...
...
@@ -104,6 +104,10 @@ class Settings < Settingslogic
git_host
[
'admin_uri'
]
||
'git@localhost:gitolite-admin'
end
def
gitolite_config_file
git_host
[
'config_file'
]
||
'gitolite.conf'
end
def
gitolite_admin_key
git_host
[
'gitolite_admin_key'
]
||
'gitlab'
end
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/backend/gitolite_config.rb
View file @
0d4568db
...
...
@@ -14,7 +14,10 @@ module Gitlab
end
def
ga_repo
@ga_repo
||=
::
Gitolite
::
GitoliteAdmin
.
new
(
File
.
join
(
config_tmp_dir
,
'gitolite'
))
@ga_repo
||=
::
Gitolite
::
GitoliteAdmin
.
new
(
File
.
join
(
config_tmp_dir
,
'gitolite'
),
conf:
Gitlab
.
config
.
gitolite_config_file
)
end
def
apply
...
...
This diff is collapsed.
Click to expand it.
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