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
Look for 'gitolite_admin_uri' in the right section of 'gitlab.yml'.
Dmitriy Zaporozhets
2 parents bb7dde0d 2600e80b
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
config/initializers/1_settings.rb
@@ -95,7 +95,7 @@ class Settings &lt; 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
...	...	@@ -95,7 +95,7 @@ class Settings < Settingslogic
95	95	end
96	96
97	97	def gitolite_admin_uri
98		- git['admin_uri'] \|\| 'git@localhost:gitolite-admin'
	98	+ git_host['admin_uri'] \|\| 'git@localhost:gitolite-admin'
99	99	end
100	100
101	101	def default_projects_limit
...	...