Update uses of Gitolite.config.foo settings

4 files changed, 7 insertions, 7 deletions

diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index 056fb034daf..8c45c93557e 100644
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -38,7 +38,7 @@ module Gitlab
         email: email,
         password: password,
         password_confirmation: password,
-        projects_limit: Gitlab.config.default_projects_limit,
+        projects_limit: Gitlab.config.gitlab.default_projects_limit,
       }, as: :admin)
       if Gitlab.config.omniauth['block_auto_created_users'] && !ldap
         @user.blocked = true
diff --git a/lib/gitlab/backend/gitolite.rb b/lib/gitlab/backend/gitolite.rb
index 7c3861bdd13..3b8a2090f73 100644
--- a/lib/gitlab/backend/gitolite.rb
+++ b/lib/gitlab/backend/gitolite.rb
@@ -38,7 +38,7 @@ module Gitlab
     end
 
     def url_to_repo path
-      Gitlab.config.ssh_path + "#{path}.git"
+      Gitlab.config.gitolite.ssh_path_prefix + "#{path}.git"
     end
 
     def enable_automerge
diff --git a/lib/gitlab/backend/gitolite_config.rb b/lib/gitlab/backend/gitolite_config.rb
index 70ccc4782c6..a2bc4ca8d74 100644
--- a/lib/gitlab/backend/gitolite_config.rb
+++ b/lib/gitlab/backend/gitolite_config.rb
@@ -16,7 +16,7 @@ module Gitlab
     def ga_repo
       @ga_repo ||= ::Gitolite::GitoliteAdmin.new(
         File.join(config_tmp_dir,'gitolite'),
-        conf: Gitlab.config.gitolite_config_file
+        conf: Gitlab.config.gitolite.config_file
       )
     end
 
@@ -167,7 +167,7 @@ module Gitlab
     # Enable access to all repos for gitolite admin.
     # We use it for accept merge request feature
     def admin_all_repo
-      owner_name = Gitlab.config.gitolite_admin_key
+      owner_name = Gitlab.config.gitolite.admin_key
 
       # @ALL repos premission for gitolite owner
       repo_name = "@all"
@@ -189,7 +189,7 @@ module Gitlab
 
     def pull tmp_dir
       Dir.mkdir tmp_dir
-      `git clone #{Gitlab.config.gitolite_admin_uri} #{tmp_dir}/gitolite`
+      `git clone #{Gitlab.config.gitolite.admin_uri} #{tmp_dir}/gitolite`
 
       unless File.exists?(File.join(tmp_dir, 'gitolite', 'conf', 'gitolite.conf'))
         raise PullError, "unable to clone gitolite-admin repo"
diff --git a/lib/gitlab/project_mover.rb b/lib/gitlab/project_mover.rb
index eeab22ae6e7..def6e90001b 100644
--- a/lib/gitlab/project_mover.rb
+++ b/lib/gitlab/project_mover.rb
@@ -15,10 +15,10 @@ module Gitlab
 
     def execute
       # Create new dir if missing
-      new_dir_path = File.join(Gitlab.config.git_base_path, new_dir)
+      new_dir_path = File.join(Gitlab.config.gitolite.repos_path, new_dir)
       system("mkdir -m 770 #{new_dir_path}") unless File.exists?(new_dir_path)
 
-      old_path = File.join(Gitlab.config.git_base_path, old_dir, "#{project.path}.git")
+      old_path = File.join(Gitlab.config.gitolite.repos_path, old_dir, "#{project.path}.git")
       new_path = File.join(new_dir_path, "#{project.path}.git")
 
       if File.exists? new_path