diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-07-11 07:50:22 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-07-11 07:50:22 -0700 |
| commit | 78af4683b13a5c909cdb910497354f674c5ab54a (patch) | |
| tree | d4228d430fc757bc5f84675d7cd1bad0e160768d | |
| parent | bb7dde0d94de939958063f06465c65e239748cfd (diff) | |
| parent | 2600e80b412a6e7256fe1f4e3ca32cc5d410b449 (diff) | |
| download | gitlab-ce-78af4683b13a5c909cdb910497354f674c5ab54a.tar.gz | |
Merge pull request #1075 from VonC/master
Look for 'gitolite_admin_uri' in the right section of 'gitlab.yml'.
| -rw-r--r-- | config/initializers/1_settings.rb | 2 |
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 |