Merge pull request #1075 from VonC/master

Look for 'gitolite_admin_uri' in the right section of 'gitlab.yml'.
2012-07-11 07:50:22 -07:00 · 2012-07-11 07:50:22 -07:00 · 78af4683b1
parent bb7dde0d94 2600e80b41
commit 78af4683b1
1 changed files with 1 additions and 1 deletions
--- 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