deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update uses of Gitolite.config.foo settings

Browse source
This commit is contained in:
Riyad Preukschas 2012-12-15 01:16:25 +01:00
parent b2e46f44ce
commit 19eb637419
33 changed files with 95 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/roles/push_observer.rb
View file

@ -114,7 +114,7 @@ module PushObserver
id: commit.id,
message: commit.safe_message,
timestamp: commit.date.xmlschema,
url: "#{Gitlab.config.url}/#{path_with_namespace}/commit/#{commit.id}",
url: "#{Gitlab.config.gitlab.url}/#{path_with_namespace}/commit/#{commit.id}",
author: {
name: commit.author_name,
email: commit.author_email

4
app/roles/repository.rb
View file

@ -97,7 +97,7 @@ module Repository
end
def path_to_repo
File.join(Gitlab.config.git_base_path, "#{path_with_namespace}.git")
File.join(Gitlab.config.gitolite.repos_path, "#{path_with_namespace}.git")
end
def namespace_dir
@ -199,7 +199,7 @@ module Repository
end
def http_url_to_repo
http_url = [Gitlab.config.url, "/", path_with_namespace, ".git"].join('')
http_url = [Gitlab.config.gitlab.url, "/", path_with_namespace, ".git"].join('')
end
# Check if current branch name is marked as protected in the system