diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/namespace.rb | 8 | ||||
| -rw-r--r-- | app/models/project.rb | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/models/namespace.rb b/app/models/namespace.rb index e1c24de949a..3c087e26c19 100644 --- a/app/models/namespace.rb +++ b/app/models/namespace.rb @@ -48,14 +48,14 @@ class Namespace < ActiveRecord::Base end def ensure_dir_exist - namespace_dir_path = File.join(Gitlab.config.git_base_path, path) + namespace_dir_path = File.join(Gitlab.config.gitolite.repos_path, path) system("mkdir -m 770 #{namespace_dir_path}") unless File.exists?(namespace_dir_path) end def move_dir if path_changed? - old_path = File.join(Gitlab.config.git_base_path, path_was) - new_path = File.join(Gitlab.config.git_base_path, path) + old_path = File.join(Gitlab.config.gitolite.repos_path, path_was) + new_path = File.join(Gitlab.config.gitolite.repos_path, path) if File.exists?(new_path) raise "Already exists" end @@ -64,7 +64,7 @@ class Namespace < ActiveRecord::Base end def rm_dir - dir_path = File.join(Gitlab.config.git_base_path, path) + dir_path = File.join(Gitlab.config.gitolite.repos_path, path) system("rm -rf #{dir_path}") end end diff --git a/app/models/project.rb b/app/models/project.rb index eb6e7cb1b08..6a427fddfac 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -195,7 +195,7 @@ class Project < ActiveRecord::Base end def web_url - [Gitlab.config.url, path_with_namespace].join("/") + [Gitlab.config.gitlab.url, path_with_namespace].join("/") end def common_notes |