diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-05 15:00:42 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-05 15:00:42 +0000 |
| commit | 7d6a0a215806cbcbd7e1918ad042d554e3b6459f (patch) | |
| tree | ffe03da206b5f35afb680df2f59d902d39342181 /app/models/project.rb | |
| parent | 780cc843df5c136184f11c9b86f57670d7fd1afb (diff) | |
| parent | 5d1391b6818b61e3b7ba4742d6487382484f9643 (diff) | |
| download | gitlab-ce-7d6a0a215806cbcbd7e1918ad042d554e3b6459f.tar.gz | |
Merge branch 'remove-project-repo' into 'master'
Remove the Project#repo method
See merge request gitlab-org/gitlab-ce!16238
Diffstat (limited to 'app/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 5d6c1b30587..4cb9d9fe637 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -987,10 +987,6 @@ class Project < ActiveRecord::Base false end - def repo - repository.rugged - end - def url_to_repo gitlab_shell.url_to_repo(full_path) end @@ -1433,7 +1429,7 @@ class Project < ActiveRecord::Base # We'd need to keep track of project full path otherwise directory tree # created with hashed storage enabled cannot be usefully imported using # the import rake task. - repo.config['gitlab.fullpath'] = gl_full_path + repository.rugged.config['gitlab.fullpath'] = gl_full_path rescue Gitlab::Git::Repository::NoRepository => e Rails.logger.error("Error writing to .git/config for project #{full_path} (#{id}): #{e.message}.") nil |