Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
1f311a9c
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1f311a9c
编写于
3月 08, 2018
作者:
M
Michael Kozono
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix moving local files during namespace transfer
上级
ea01d475
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
99 addition
and
22 deletion
+99
-22
app/models/concerns/storage/legacy_namespace.rb
app/models/concerns/storage/legacy_namespace.rb
+9
-2
changelogs/unreleased/mk-fix-move-upload-files-on-group-transfer.yml
...unreleased/mk-fix-move-upload-files-on-group-transfer.yml
+5
-0
lib/gitlab/project_transfer.rb
lib/gitlab/project_transfer.rb
+11
-5
spec/lib/gitlab/project_transfer_spec.rb
spec/lib/gitlab/project_transfer_spec.rb
+35
-0
spec/models/namespace_spec.rb
spec/models/namespace_spec.rb
+39
-15
未找到文件。
app/models/concerns/storage/legacy_namespace.rb
浏览文件 @
1f311a9c
...
...
@@ -27,8 +27,15 @@ module Storage
end
end
Gitlab
::
UploadsTransfer
.
new
.
rename_namespace
(
full_path_was
,
full_path
)
Gitlab
::
PagesTransfer
.
new
.
rename_namespace
(
full_path_was
,
full_path
)
if
parent_changed?
former_parent_full_path
=
parent_id_was
.
nil?
?
nil
:
Namespace
.
find
(
parent_id_was
).
full_path
parent_full_path
=
parent
&
.
full_path
Gitlab
::
UploadsTransfer
.
new
.
move_namespace
(
path
,
former_parent_full_path
,
parent_full_path
)
Gitlab
::
PagesTransfer
.
new
.
move_namespace
(
path
,
former_parent_full_path
,
parent_full_path
)
else
Gitlab
::
UploadsTransfer
.
new
.
rename_namespace
(
full_path_was
,
full_path
)
Gitlab
::
PagesTransfer
.
new
.
rename_namespace
(
full_path_was
,
full_path
)
end
remove_exports!
...
...
changelogs/unreleased/mk-fix-move-upload-files-on-group-transfer.yml
0 → 100644
浏览文件 @
1f311a9c
---
title
:
Fix missing uploads after group transfer
merge_request
:
17658
author
:
type
:
fixed
lib/gitlab/project_transfer.rb
浏览文件 @
1f311a9c
module
Gitlab
# This class is used to move local, unhashed files owned by projects to their new location
class
ProjectTransfer
def
move_project
(
project_path
,
namespace_path_was
,
namespace_path
)
new_namespace_folder
=
File
.
join
(
root_dir
,
namespace_path
)
FileUtils
.
mkdir_p
(
new_namespace_folder
)
unless
Dir
.
exist?
(
new_namespace_folder
)
from
=
File
.
join
(
root_dir
,
namespace_path_was
,
project_path
)
to
=
File
.
join
(
root_dir
,
namespace_path
,
project_path
)
# nil parent_path (or parent_path_was) represents a root namespace
def
move_namespace
(
path
,
parent_path_was
,
parent_path
)
parent_path_was
||=
''
parent_path
||=
''
new_parent_folder
=
File
.
join
(
root_dir
,
parent_path
)
FileUtils
.
mkdir_p
(
new_parent_folder
)
from
=
File
.
join
(
root_dir
,
parent_path_was
,
path
)
to
=
File
.
join
(
root_dir
,
parent_path
,
path
)
move
(
from
,
to
,
""
)
end
alias_method
:move_project
,
:move_namespace
def
rename_project
(
path_was
,
path
,
namespace_path
)
base_dir
=
File
.
join
(
root_dir
,
namespace_path
)
move
(
path_was
,
path
,
base_dir
)
...
...
spec/lib/gitlab/project_transfer_spec.rb
浏览文件 @
1f311a9c
...
...
@@ -29,6 +29,41 @@ describe Gitlab::ProjectTransfer do
end
end
describe
'#move_namespace'
do
context
'when moving namespace from root into another namespace'
do
it
"moves namespace projects' upload"
do
child_namespace
=
'test_child_namespace'
FileUtils
.
mkdir_p
(
File
.
join
(
@root_dir
,
child_namespace
,
@project_path
))
@project_transfer
.
move_namespace
(
child_namespace
,
nil
,
@namespace_path
)
expected_path
=
File
.
join
(
@root_dir
,
@namespace_path
,
child_namespace
,
@project_path
)
expect
(
Dir
.
exist?
(
expected_path
)).
to
be_truthy
end
end
context
'when moving namespace from one parent to another'
do
it
"moves namespace projects' upload"
do
child_namespace
=
'test_child_namespace'
FileUtils
.
mkdir_p
(
File
.
join
(
@root_dir
,
@namespace_path_was
,
child_namespace
,
@project_path
))
@project_transfer
.
move_namespace
(
child_namespace
,
@namespace_path_was
,
@namespace_path
)
expected_path
=
File
.
join
(
@root_dir
,
@namespace_path
,
child_namespace
,
@project_path
)
expect
(
Dir
.
exist?
(
expected_path
)).
to
be_truthy
end
end
context
'when moving namespace from having a parent to root'
do
it
"moves namespace projects' upload"
do
child_namespace
=
'test_child_namespace'
FileUtils
.
mkdir_p
(
File
.
join
(
@root_dir
,
@namespace_path_was
,
child_namespace
,
@project_path
))
@project_transfer
.
move_namespace
(
child_namespace
,
@namespace_path_was
,
nil
)
expected_path
=
File
.
join
(
@root_dir
,
child_namespace
,
@project_path
)
expect
(
Dir
.
exist?
(
expected_path
)).
to
be_truthy
end
end
end
describe
'#rename_project'
do
it
"renames project"
do
FileUtils
.
mkdir_p
(
File
.
join
(
@root_dir
,
@namespace_path
,
@project_path_was
))
...
...
spec/models/namespace_spec.rb
浏览文件 @
1f311a9c
...
...
@@ -206,41 +206,65 @@ describe Namespace do
context
'with subgroups'
do
let
(
:parent
)
{
create
(
:group
,
name:
'parent'
,
path:
'parent'
)
}
let
(
:new_parent
)
{
create
(
:group
,
name:
'new_parent'
,
path:
'new_parent'
)
}
let
(
:child
)
{
create
(
:group
,
name:
'child'
,
path:
'child'
,
parent:
parent
)
}
let!
(
:project
)
{
create
(
:project_empty_repo
,
:legacy_storage
,
path:
'the-project'
,
namespace:
child
,
skip_disk_validation:
true
)
}
let
(
:uploads_dir
)
{
FileUploader
.
root
}
let
(
:pages_dir
)
{
File
.
join
(
TestEnv
.
pages_path
)
}
def
expect_project_directories_at
(
namespace_path
)
expected_repository_path
=
File
.
join
(
TestEnv
.
repos_path
,
namespace_path
,
'the-project.git'
)
expected_upload_path
=
File
.
join
(
uploads_dir
,
namespace_path
,
'the-project'
)
expected_pages_path
=
File
.
join
(
pages_dir
,
namespace_path
,
'the-project'
)
expect
(
File
.
directory?
(
expected_repository_path
)).
to
be
(
true
)
expect
(
File
.
directory?
(
expected_upload_path
)).
to
be
(
true
)
expect
(
File
.
directory?
(
expected_pages_path
)).
to
be
(
true
)
end
before
do
FileUtils
.
mkdir_p
(
File
.
join
(
TestEnv
.
repos_path
,
"
#{
project
.
full_path
}
.git"
))
FileUtils
.
mkdir_p
(
File
.
join
(
uploads_dir
,
project
.
full_path
))
FileUtils
.
mkdir_p
(
File
.
join
(
pages_dir
,
project
.
full_path
))
end
context
'renaming child'
do
it
'correctly moves the repository, uploads and pages'
do
expected_repository_path
=
File
.
join
(
TestEnv
.
repos_path
,
'parent'
,
'renamed'
,
'the-project.git'
)
expected_upload_path
=
File
.
join
(
uploads_dir
,
'parent'
,
'renamed'
,
'the-project'
)
expected_pages_path
=
File
.
join
(
pages_dir
,
'parent'
,
'renamed'
,
'the-project'
)
child
.
update!
(
path:
'renamed'
)
child
.
update_attributes!
(
path:
'renamed'
)
expect
(
File
.
directory?
(
expected_repository_path
)).
to
be
(
true
)
expect
(
File
.
directory?
(
expected_upload_path
)).
to
be
(
true
)
expect
(
File
.
directory?
(
expected_pages_path
)).
to
be
(
true
)
expect_project_directories_at
(
'parent/renamed'
)
end
end
context
'renaming parent'
do
it
'correctly moves the repository, uploads and pages'
do
expected_repository_path
=
File
.
join
(
TestEnv
.
repos_path
,
'renamed'
,
'child'
,
'the-project.git'
)
expected_upload_path
=
File
.
join
(
uploads_dir
,
'renamed'
,
'child'
,
'the-project'
)
expected_pages_path
=
File
.
join
(
pages_dir
,
'renamed'
,
'child'
,
'the-project'
)
parent
.
update!
(
path:
'renamed'
)
expect_project_directories_at
(
'renamed/child'
)
end
end
context
'moving from one parent to another'
do
it
'correctly moves the repository, uploads and pages'
do
child
.
update!
(
parent:
new_parent
)
parent
.
update_attributes!
(
path:
'renamed'
)
expect_project_directories_at
(
'new_parent/child'
)
end
end
context
'moving from having a parent to root'
do
it
'correctly moves the repository, uploads and pages'
do
child
.
update!
(
parent:
nil
)
expect_project_directories_at
(
'child'
)
end
end
context
'moving from root to having a parent'
do
it
'correctly moves the repository, uploads and pages'
do
parent
.
update!
(
parent:
new_parent
)
expect
(
File
.
directory?
(
expected_repository_path
)).
to
be
(
true
)
expect
(
File
.
directory?
(
expected_upload_path
)).
to
be
(
true
)
expect
(
File
.
directory?
(
expected_pages_path
)).
to
be
(
true
)
expect_project_directories_at
(
'new_parent/parent/child'
)
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录