Commit 367c4f42f0c374e60da73b61a1e5992bfa268343

Authored by Dmitriy Zaporozhets
1 parent 8209a2ff

one config file, git options added

config/email.yml
@@ -1,2 +0,0 @@ @@ -1,2 +0,0 @@
1 -from: notify@gitlabhq.com  
2 -host: gitlabhq.com  
config/gitlab.yml 0 → 100644
@@ -0,0 +1,24 @@ @@ -0,0 +1,24 @@
  1 +# Gitlab application config file
  2 +
  3 +# Email used for notification
  4 +# about new issues, comments
  5 +email:
  6 + from: notify@gitlabhq.com
  7 + host: gitlabhq.com
  8 +
  9 +# Gitosis congiguration
  10 +gitosis:
  11 + admin_uri: git@localhost:gitosis-admin.git
  12 + base_path: /home/git/repositories/
  13 + host: localhost
  14 + git_user: git
  15 + # port: 22
  16 +
  17 +# Git settings
  18 +# Use default values unless you understand it
  19 +git:
  20 + # Max size of git object like commit, in bytes
  21 + # This value can be increased if you have a very large commits
  22 + git_max_size: 5242880 # 5.megabytes
  23 + # Git timeout to read commit, in seconds
  24 + git_timeout: 10
config/gitosis.yml
@@ -1,5 +0,0 @@ @@ -1,5 +0,0 @@
1 -admin_uri: git@localhost:gitosis-admin.git  
2 -base_path: /home/git/repositories/  
3 -host: localhost  
4 -git_user: git  
5 -# port: 22  
config/initializers/gitlabhq/10_load_config.rb 0 → 100644
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
  1 +GITOSIS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["gitosis"]
  2 +EMAIL_OPTS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["email"]
  3 +GIT_OPTS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["git"]
config/initializers/gitlabhq/20_grit_ext.rb 0 → 100644
@@ -0,0 +1,15 @@ @@ -0,0 +1,15 @@
  1 +require 'grit'
  2 +require 'pygments'
  3 +require "utils"
  4 +
  5 +Grit::Blob.class_eval do
  6 + include Utils::FileHelper
  7 + include Utils::Colorize
  8 +end
  9 +
  10 +Grit::Commit.class_eval do
  11 + include CommitExt
  12 +end
  13 +
  14 +Grit::Git.git_timeout = GIT_OPTS["git_timeout"]
  15 +Grit::Git.git_max_size = GIT_OPTS["git_max_size"]
config/initializers/grit_ext.rb
@@ -1,12 +0,0 @@ @@ -1,12 +0,0 @@
1 -require 'grit'  
2 -require 'pygments'  
3 -require "utils"  
4 -  
5 -Grit::Blob.class_eval do  
6 - include Utils::FileHelper  
7 - include Utils::Colorize  
8 -end  
9 -  
10 -Grit::Commit.class_eval do  
11 - include CommitExt  
12 -end  
config/initializers/load_config.rb
@@ -1,2 +0,0 @@ @@ -1,2 +0,0 @@
1 -GITOSIS = YAML.load_file("#{Rails.root}/config/gitosis.yml")  
2 -EMAIL_OPTS = YAML.load_file("#{Rails.root}/config/email.yml")