diff options
| author | James Lopez <james@jameslopez.es> | 2016-06-30 14:37:48 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-06-30 14:37:48 +0200 |
| commit | 67f59ebd50511bfba1ebdc73b6fd269f425ac6f0 (patch) | |
| tree | 635c708678523ca5149880c1bea6dd8fa73c0a0f /app/models/repository.rb | |
| parent | 545b92af067832d560846b7ec7cb26caf3302275 (diff) | |
| parent | 1a68a0a6f55049b4ad42222b0dc667fe625a7604 (diff) | |
| download | gitlab-ce-67f59ebd50511bfba1ebdc73b6fd269f425ac6f0.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-url-validator
# Conflicts:
# spec/models/project_spec.rb
Diffstat (limited to 'app/models/repository.rb')
| -rw-r--r-- | app/models/repository.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 2a6a3b086c2..f45c3d06abd 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -39,7 +39,7 @@ class Repository # Return absolute path to repository def path_to_repo @path_to_repo ||= File.expand_path( - File.join(Gitlab.config.gitlab_shell.repos_path, path_with_namespace + ".git") + File.join(@project.repository_storage_path, path_with_namespace + ".git") ) end |