Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
6d1c5014
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,发现更多精彩内容 >>
提交
6d1c5014
编写于
3月 05, 2018
作者:
T
Travis Miller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
review: rename import_export to import_export_shared
上级
e2006121
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
18 addition
and
18 deletion
+18
-18
app/models/project.rb
app/models/project.rb
+4
-4
app/services/projects/import_export/export_service.rb
app/services/projects/import_export/export_service.rb
+1
-1
lib/gitlab/import_export/importer.rb
lib/gitlab/import_export/importer.rb
+1
-1
spec/lib/gitlab/import_export/avatar_restorer_spec.rb
spec/lib/gitlab/import_export/avatar_restorer_spec.rb
+1
-1
spec/lib/gitlab/import_export/avatar_saver_spec.rb
spec/lib/gitlab/import_export/avatar_saver_spec.rb
+1
-1
spec/lib/gitlab/import_export/fork_spec.rb
spec/lib/gitlab/import_export/fork_spec.rb
+1
-1
spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
+2
-2
spec/lib/gitlab/import_export/project_tree_saver_spec.rb
spec/lib/gitlab/import_export/project_tree_saver_spec.rb
+1
-1
spec/lib/gitlab/import_export/repo_restorer_spec.rb
spec/lib/gitlab/import_export/repo_restorer_spec.rb
+1
-1
spec/lib/gitlab/import_export/repo_saver_spec.rb
spec/lib/gitlab/import_export/repo_saver_spec.rb
+1
-1
spec/lib/gitlab/import_export/uploads_restorer_spec.rb
spec/lib/gitlab/import_export/uploads_restorer_spec.rb
+1
-1
spec/lib/gitlab/import_export/uploads_saver_spec.rb
spec/lib/gitlab/import_export/uploads_saver_spec.rb
+1
-1
spec/lib/gitlab/import_export/wiki_repo_saver_spec.rb
spec/lib/gitlab/import_export/wiki_repo_saver_spec.rb
+1
-1
spec/lib/gitlab/import_export/wiki_restorer_spec.rb
spec/lib/gitlab/import_export/wiki_restorer_spec.rb
+1
-1
未找到文件。
app/models/project.rb
浏览文件 @
6d1c5014
...
...
@@ -1557,14 +1557,14 @@ class Project < ActiveRecord::Base
end
end
def
import_export
@import_export
||=
Gitlab
::
ImportExport
::
Shared
.
new
(
self
)
def
import_export
_shared
@import_export
_shared
||=
Gitlab
::
ImportExport
::
Shared
.
new
(
self
)
end
def
export_path
return
nil
unless
namespace
.
present?
||
hashed_storage?
(
:repository
)
import_export
.
archive_path
import_export
_shared
.
archive_path
end
def
export_project_path
...
...
@@ -1582,7 +1582,7 @@ class Project < ActiveRecord::Base
end
def
export_in_progress?
import_export
.
active_export_count
>
0
import_export
_shared
.
active_export_count
>
0
end
def
remove_exports
...
...
app/services/projects/import_export/export_service.rb
浏览文件 @
6d1c5014
...
...
@@ -2,7 +2,7 @@ module Projects
module
ImportExport
class
ExportService
<
BaseService
def
execute
(
_options
=
{})
@shared
=
project
.
import_export
@shared
=
project
.
import_export
_shared
save_all
end
...
...
lib/gitlab/import_export/importer.rb
浏览文件 @
6d1c5014
...
...
@@ -9,7 +9,7 @@ module Gitlab
@archive_file
=
project
.
import_source
@current_user
=
project
.
creator
@project
=
project
@shared
=
project
.
import_export
@shared
=
project
.
import_export
_shared
end
def
execute
...
...
spec/lib/gitlab/import_export/avatar_restorer_spec.rb
浏览文件 @
6d1c5014
...
...
@@ -3,7 +3,7 @@ require 'spec_helper'
describe
Gitlab
::
ImportExport
::
AvatarRestorer
do
include
UploadHelpers
let
(
:shared
)
{
project
.
import_export
}
let
(
:shared
)
{
project
.
import_export
_shared
}
let
(
:project
)
{
create
(
:project
)
}
before
do
...
...
spec/lib/gitlab/import_export/avatar_saver_spec.rb
浏览文件 @
6d1c5014
require
'spec_helper'
describe
Gitlab
::
ImportExport
::
AvatarSaver
do
let
(
:shared
)
{
project
.
import_export
}
let
(
:shared
)
{
project
.
import_export
_shared
}
let
(
:export_path
)
{
"
#{
Dir
.
tmpdir
}
/project_tree_saver_spec"
}
let
(
:project_with_avatar
)
{
create
(
:project
,
avatar:
fixture_file_upload
(
Rails
.
root
+
"spec/fixtures/dk.png"
,
"image/png"
))
}
let
(
:project
)
{
create
(
:project
)
}
...
...
spec/lib/gitlab/import_export/fork_spec.rb
浏览文件 @
6d1c5014
...
...
@@ -7,7 +7,7 @@ describe 'forked project import' do
let!
(
:project_with_repo
)
{
create
(
:project
,
:repository
,
name:
'test-repo-restorer'
,
path:
'test-repo-restorer'
)
}
let!
(
:project
)
{
create
(
:project
,
name:
'test-repo-restorer-no-repo'
,
path:
'test-repo-restorer-no-repo'
)
}
let
(
:export_path
)
{
"
#{
Dir
.
tmpdir
}
/project_tree_saver_spec"
}
let
(
:shared
)
{
project
.
import_export
}
let
(
:shared
)
{
project
.
import_export
_shared
}
let
(
:forked_from_project
)
{
create
(
:project
,
:repository
)
}
let
(
:forked_project
)
{
fork_project
(
project_with_repo
,
nil
,
repository:
true
)
}
let
(
:repo_saver
)
{
Gitlab
::
ImportExport
::
RepoSaver
.
new
(
project:
project_with_repo
,
shared:
shared
)
}
...
...
spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
浏览文件 @
6d1c5014
...
...
@@ -8,7 +8,7 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
RSpec
::
Mocks
.
with_temporary_scope
do
@project
=
create
(
:project
,
:builds_disabled
,
:issues_disabled
,
name:
'project'
,
path:
'project'
)
@shared
=
@project
.
import_export
@shared
=
@project
.
import_export
_shared
allow
(
@shared
).
to
receive
(
:export_path
).
and_return
(
'spec/lib/gitlab/import_export/'
)
allow_any_instance_of
(
Repository
).
to
receive
(
:fetch_ref
).
and_return
(
true
)
...
...
@@ -259,7 +259,7 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
context
'Light JSON'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:shared
)
{
project
.
import_export
}
let
(
:shared
)
{
project
.
import_export
_shared
}
let!
(
:project
)
{
create
(
:project
,
:builds_disabled
,
:issues_disabled
,
name:
'project'
,
path:
'project'
)
}
let
(
:project_tree_restorer
)
{
described_class
.
new
(
user:
user
,
shared:
shared
,
project:
project
)
}
let
(
:restored_project_json
)
{
project_tree_restorer
.
restore
}
...
...
spec/lib/gitlab/import_export/project_tree_saver_spec.rb
浏览文件 @
6d1c5014
...
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
Gitlab
::
ImportExport
::
ProjectTreeSaver
do
describe
'saves the project tree into a json object'
do
let
(
:shared
)
{
project
.
import_export
}
let
(
:shared
)
{
project
.
import_export
_shared
}
let
(
:project_tree_saver
)
{
described_class
.
new
(
project:
project
,
current_user:
user
,
shared:
shared
)
}
let
(
:export_path
)
{
"
#{
Dir
.
tmpdir
}
/project_tree_saver_spec"
}
let
(
:user
)
{
create
(
:user
)
}
...
...
spec/lib/gitlab/import_export/repo_restorer_spec.rb
浏览文件 @
6d1c5014
...
...
@@ -6,7 +6,7 @@ describe Gitlab::ImportExport::RepoRestorer do
let!
(
:project_with_repo
)
{
create
(
:project
,
:repository
,
name:
'test-repo-restorer'
,
path:
'test-repo-restorer'
)
}
let!
(
:project
)
{
create
(
:project
)
}
let
(
:export_path
)
{
"
#{
Dir
.
tmpdir
}
/project_tree_saver_spec"
}
let
(
:shared
)
{
project
.
import_export
}
let
(
:shared
)
{
project
.
import_export
_shared
}
let
(
:bundler
)
{
Gitlab
::
ImportExport
::
RepoSaver
.
new
(
project:
project_with_repo
,
shared:
shared
)
}
let
(
:bundle_path
)
{
File
.
join
(
shared
.
export_path
,
Gitlab
::
ImportExport
.
project_bundle_filename
)
}
let
(
:restorer
)
do
...
...
spec/lib/gitlab/import_export/repo_saver_spec.rb
浏览文件 @
6d1c5014
...
...
@@ -5,7 +5,7 @@ describe Gitlab::ImportExport::RepoSaver do
let
(
:user
)
{
create
(
:user
)
}
let!
(
:project
)
{
create
(
:project
,
:public
,
name:
'searchable_project'
)
}
let
(
:export_path
)
{
"
#{
Dir
.
tmpdir
}
/project_tree_saver_spec"
}
let
(
:shared
)
{
project
.
import_export
}
let
(
:shared
)
{
project
.
import_export
_shared
}
let
(
:bundler
)
{
described_class
.
new
(
project:
project
,
shared:
shared
)
}
before
do
...
...
spec/lib/gitlab/import_export/uploads_restorer_spec.rb
浏览文件 @
6d1c5014
...
...
@@ -3,7 +3,7 @@ require 'spec_helper'
describe
Gitlab
::
ImportExport
::
UploadsRestorer
do
describe
'bundle a project Git repo'
do
let
(
:export_path
)
{
"
#{
Dir
.
tmpdir
}
/uploads_saver_spec"
}
let
(
:shared
)
{
project
.
import_export
}
let
(
:shared
)
{
project
.
import_export
_shared
}
before
do
allow_any_instance_of
(
Gitlab
::
ImportExport
).
to
receive
(
:storage_path
).
and_return
(
export_path
)
...
...
spec/lib/gitlab/import_export/uploads_saver_spec.rb
浏览文件 @
6d1c5014
...
...
@@ -4,7 +4,7 @@ describe Gitlab::ImportExport::UploadsSaver do
describe
'bundle a project Git repo'
do
let
(
:export_path
)
{
"
#{
Dir
.
tmpdir
}
/uploads_saver_spec"
}
let
(
:file
)
{
fixture_file_upload
(
Rails
.
root
+
'spec/fixtures/banana_sample.gif'
,
'image/gif'
)
}
let
(
:shared
)
{
project
.
import_export
}
let
(
:shared
)
{
project
.
import_export
_shared
}
before
do
allow_any_instance_of
(
Gitlab
::
ImportExport
).
to
receive
(
:storage_path
).
and_return
(
export_path
)
...
...
spec/lib/gitlab/import_export/wiki_repo_saver_spec.rb
浏览文件 @
6d1c5014
...
...
@@ -5,7 +5,7 @@ describe Gitlab::ImportExport::WikiRepoSaver do
let
(
:user
)
{
create
(
:user
)
}
let!
(
:project
)
{
create
(
:project
,
:public
,
name:
'searchable_project'
)
}
let
(
:export_path
)
{
"
#{
Dir
.
tmpdir
}
/project_tree_saver_spec"
}
let
(
:shared
)
{
project
.
import_export
}
let
(
:shared
)
{
project
.
import_export
_shared
}
let
(
:wiki_bundler
)
{
described_class
.
new
(
project:
project
,
shared:
shared
)
}
let!
(
:project_wiki
)
{
ProjectWiki
.
new
(
project
,
user
)
}
...
...
spec/lib/gitlab/import_export/wiki_restorer_spec.rb
浏览文件 @
6d1c5014
...
...
@@ -6,7 +6,7 @@ describe Gitlab::ImportExport::WikiRestorer do
let!
(
:project_without_wiki
)
{
create
(
:project
)
}
let!
(
:project
)
{
create
(
:project
)
}
let
(
:export_path
)
{
"
#{
Dir
.
tmpdir
}
/project_tree_saver_spec"
}
let
(
:shared
)
{
project
.
import_export
}
let
(
:shared
)
{
project
.
import_export
_shared
}
let
(
:bundler
)
{
Gitlab
::
ImportExport
::
WikiRepoSaver
.
new
(
project:
project_with_wiki
,
shared:
shared
)
}
let
(
:bundle_path
)
{
File
.
join
(
shared
.
export_path
,
Gitlab
::
ImportExport
.
project_bundle_filename
)
}
let
(
:restorer
)
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录