Merge pull request #1075 from VonC/master

Look for 'gitolite_admin_uri' in the right section of 'gitlab.yml'.

Merge pull request #1075 from VonC/master
78af4683 · Dmitriy Zaporozhets · bb7dde0d · 2600e80b · 78af4683
Commit 78af4683 authored Jul 11, 2012 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

1_settings.rb config/initializers/1_settings.rb +1 -1

No files found.
--- 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