summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVonC <vonc@laposte.net>2012-07-11 16:36:00 +0200
committerVonC <vonc@laposte.net>2012-07-11 16:37:34 +0200
commit2600e80b412a6e7256fe1f4e3ca32cc5d410b449 (patch)
treed4228d430fc757bc5f84675d7cd1bad0e160768d
parentbb7dde0d94de939958063f06465c65e239748cfd (diff)
downloadgitlab-ce-2600e80b412a6e7256fe1f4e3ca32cc5d410b449.tar.gz
Look for 'gitolite_admin_uri' in the right section
of 'gitlab.yml'. gitlabhq\config\initializers\1_settings.rb looks for 'gitolite_admin_uri' in the 'git' section of 'gitlab.yml' Actually, that setting is in the 'git_host' section. If not fixed, the 'gitolite_admin_uri' would always be equals to 'git@localhost:gitolite-admin', even if the administrator wants to have another user than 'git' in charge of that repo.
-rw-r--r--config/initializers/1_settings.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index bbf5976bf74..5c5987a8857 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -95,7 +95,7 @@ class Settings < Settingslogic
end
def gitolite_admin_uri
- git['admin_uri'] || 'git@localhost:gitolite-admin'
+ git_host['admin_uri'] || 'git@localhost:gitolite-admin'
end
def default_projects_limit