From 19eb63741995e3be60781db74edab5d5ae896c6b Mon Sep 17 00:00:00 2001
From: Riyad Preukschas <riyad@informatik.uni-bremen.de>
Date: Sat, 15 Dec 2012 01:16:25 +0100
Subject: Update uses of Gitolite.config.foo settings

---
 config/initializers/3_grit_ext.rb | 4 ++--
 config/initializers/devise.rb     | 2 +-
 config/routes.rb                  | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'config')

diff --git a/config/initializers/3_grit_ext.rb b/config/initializers/3_grit_ext.rb
index d114ea6cc8b..097c301a06a 100644
--- a/config/initializers/3_grit_ext.rb
+++ b/config/initializers/3_grit_ext.rb
@@ -1,8 +1,8 @@
 require 'grit'
 require 'pygments'
 
-Grit::Git.git_timeout = Gitlab.config.git_timeout
-Grit::Git.git_max_size = Gitlab.config.git_max_size
+Grit::Git.git_timeout = Gitlab.config.git.timeout
+Grit::Git.git_max_size = Gitlab.config.git.max_size
 
 Grit::Blob.class_eval do
   include Linguist::BlobHelper
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 8f3cef5a2ac..db7246a1b9b 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -4,7 +4,7 @@ Devise.setup do |config|
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class with default "from" parameter.
-  config.mailer_sender = Gitlab.config.email_from
+  config.mailer_sender = Gitlab.config.gitlab.email_from
 
   # Configure the class responsible to send e-mails.
   # config.mailer = "Devise::Mailer"
diff --git a/config/routes.rb b/config/routes.rb
index 7214a786132..e08bfebc020 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -14,10 +14,10 @@ Gitlab::Application.routes.draw do
 
   # Enable Grack support
   mount Grack::Bundle.new({
-    git_path:     Gitlab.config.git_bin_path,
-    project_root: Gitlab.config.git_base_path,
-    upload_pack:  Gitlab.config.git_upload_pack,
-    receive_pack: Gitlab.config.git_receive_pack
+    git_path:     Gitlab.config.git.bin_path,
+    project_root: Gitlab.config.gitolite.repos_path,
+    upload_pack:  Gitlab.config.gitolite.upload_pack,
+    receive_pack: Gitlab.config.gitolite.receive_pack
   }), at: '/:path', constraints: { path: /[-\/\w\.-]+\.git/ }
 
   #
-- 
cgit v1.2.1