Update uses of Gitolite.config.foo settings
This commit is contained in:
parent
b2e46f44ce
commit
19eb637419
33 changed files with 95 additions and 95 deletions
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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/ }
|
||||
|
||||
#
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue