diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-01-22 08:46:37 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-01-22 08:46:37 +0000 |
| commit | 6a1da5673187617abb4c61afab998fc6fbfb3238 (patch) | |
| tree | 67e50be5fb48109849a5db8883ff15c3e465f642 /app | |
| parent | bd5bb6ee9172206f4ba08ccf5fdf419544419d2d (diff) | |
| parent | 31268b1b1a26e0042eedcfec8e42579077a145b6 (diff) | |
| download | gitlab-ce-6a1da5673187617abb4c61afab998fc6fbfb3238.tar.gz | |
Merge branch 'gitaly-write-repo-config-prep' into 'master'
Move rugged-call from Project#write_repository_config to Git::Repository#write_config
See merge request gitlab-org/gitlab-ce!16572
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/project.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 5d0e61ecaa7..c0f7b30ceb0 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1438,7 +1438,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. - repository.rugged.config['gitlab.fullpath'] = gl_full_path + repository.raw_repository.write_config(full_path: 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 |