Commit 78af4683 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #1075 from VonC/master

Look for 'gitolite_admin_uri' in the right section of 'gitlab.yml'.
parents bb7dde0d 2600e80b
...@@ -95,7 +95,7 @@ class Settings < Settingslogic ...@@ -95,7 +95,7 @@ class Settings < Settingslogic
end end
def gitolite_admin_uri def gitolite_admin_uri
git['admin_uri'] || 'git@localhost:gitolite-admin' git_host['admin_uri'] || 'git@localhost:gitolite-admin'
end end
def default_projects_limit def default_projects_limit
......
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