diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2017-12-19 14:36:33 -0200 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-01-03 16:13:31 -0200 |
| commit | 9504a529b758b0352b9c60d67fda8b4ee2a5fec0 (patch) | |
| tree | fb83470abf88a850895e986be4e9c8ba544ec326 | |
| parent | 946a3634bc5a851944e5cc7fe8fdb5341ca5176b (diff) | |
| download | gitlab-ce-9504a529b758b0352b9c60d67fda8b4ee2a5fec0.tar.gz | |
Write project full path to .git/config when creating projects
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.
| -rw-r--r-- | app/models/project.rb | 5 | ||||
| -rw-r--r-- | app/services/projects/create_service.rb | 5 | ||||
| -rw-r--r-- | spec/services/projects/create_service_spec.rb | 6 |
3 files changed, 16 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 6ebb083aeb4..eac78de1ac9 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1432,6 +1432,11 @@ class Project < ActiveRecord::Base Gitlab::PagesTransfer.new.rename_project(path_before_change, self.path, namespace.full_path) end + def write_repository_config(key, value, prefix: :gitlab) + key = [prefix, key].compact.join('.') + repo.config[key] = value + end + def rename_repo_notify! send_move_instructions(full_path_was) expires_full_path_cache diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb index dc7b1f1f5cc..4c7e5370bbe 100644 --- a/app/services/projects/create_service.rb +++ b/app/services/projects/create_service.rb @@ -87,6 +87,11 @@ module Projects def after_create_actions log_info("#{@project.owner.name} created a new project \"#{@project.name_with_namespace}\"") + # 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. + @project.write_repository_config(:fullpath, @project.full_path) + unless @project.gitlab_project_import? @project.create_wiki unless skip_wiki? create_services_from_active_templates(@project) diff --git a/spec/services/projects/create_service_spec.rb b/spec/services/projects/create_service_spec.rb index dc89fdebce7..1833078f37c 100644 --- a/spec/services/projects/create_service_spec.rb +++ b/spec/services/projects/create_service_spec.rb @@ -252,6 +252,12 @@ describe Projects::CreateService, '#execute' do end end + it 'writes project full path to .git/config' do + project = create_project(user, opts) + + expect(project.repo.config['gitlab.fullpath']).to eq project.full_path + end + def create_project(user, opts) Projects::CreateService.new(user, opts).execute end |