From 2600e80b412a6e7256fe1f4e3ca32cc5d410b449 Mon Sep 17 00:00:00 2001 From: VonC Date: Wed, 11 Jul 2012 16:36:00 +0200 Subject: [PATCH] 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. --- config/initializers/1_settings.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index bbf5976b..5c5987a8 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