diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/environment.rb | 2 | ||||
| -rw-r--r-- | config/gitlab.yml | 3 | ||||
| -rw-r--r-- | config/initializers/gitlabhq/10_load_config.rb | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/config/environment.rb b/config/environment.rb index 1c2d723e18b..9b09be0557d 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -4,4 +4,4 @@ require File.expand_path('../application', __FILE__) # Initialize the rails application Gitlab::Application.initialize! -require File.join(Rails.root, "lib", "gitosis") +require File.join(Rails.root, "lib", "gitlabhq", "git_host") diff --git a/config/gitlab.yml b/config/gitlab.yml index 3afd9c1111c..c61d382f65b 100644 --- a/config/gitlab.yml +++ b/config/gitlab.yml @@ -7,7 +7,8 @@ email: host: gitlabhq.com # Gitosis congiguration -gitosis: +git_host: + system: gitolite# or gitosis admin_uri: git@localhost:gitolite-admin base_path: /home/git/repositories/ host: localhost diff --git a/config/initializers/gitlabhq/10_load_config.rb b/config/initializers/gitlabhq/10_load_config.rb index cfda096e5e8..96919595815 100644 --- a/config/initializers/gitlabhq/10_load_config.rb +++ b/config/initializers/gitlabhq/10_load_config.rb @@ -1,3 +1,3 @@ -GITOSIS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["gitosis"] +GIT_HOST = YAML.load_file("#{Rails.root}/config/gitlab.yml")["git_host"] EMAIL_OPTS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["email"] GIT_OPTS = YAML.load_file("#{Rails.root}/config/gitlab.yml")["git"] |