Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
07ab6c2e
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,发现更多精彩内容 >>
提交
07ab6c2e
编写于
5月 02, 2016
作者:
J
James Lopez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactoring and fixing a bunch of stuff
上级
7ebf22e0
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
7 addition
and
68 deletion
+7
-68
app/controllers/import/gitlab_projects_controller.rb
app/controllers/import/gitlab_projects_controller.rb
+2
-6
app/views/import/gitlab_projects/status.html.haml
app/views/import/gitlab_projects/status.html.haml
+0
-55
lib/gitlab/import_export/command_line_util.rb
lib/gitlab/import_export/command_line_util.rb
+1
-1
lib/gitlab/import_export/import_service.rb
lib/gitlab/import_export/import_service.rb
+1
-2
lib/gitlab/import_export/repo_restorer.rb
lib/gitlab/import_export/repo_restorer.rb
+1
-1
spec/features/projects/import_export/import_file_spec.rb
spec/features/projects/import_export/import_file_spec.rb
+2
-3
未找到文件。
app/controllers/import/gitlab_projects_controller.rb
浏览文件 @
07ab6c2e
...
...
@@ -12,13 +12,7 @@ class Import::GitlabProjectsController < Import::BaseController
end
def
status
@repos
=
client
.
projects
@incompatible_repos
=
client
.
incompatible_projects
@already_added_projects
=
current_user
.
created_projects
.
where
(
import_type:
"gitlab_project"
)
already_added_projects_names
=
@already_added_projects
.
pluck
(
:import_source
)
@repos
.
to_a
.
reject!
{
|
repo
|
already_added_projects_names
.
include?
"
#{
repo
[
"owner"
]
}
/
#{
repo
[
"slug"
]
}
"
}
end
def
jobs
...
...
@@ -39,6 +33,8 @@ class Import::GitlabProjectsController < Import::BaseController
tmp_file:
File
.
expand_path
(
file
.
path
),
namespace_id:
namespace_id
,
project_path:
path
)
redirect_to
status_import_gitlab_project_path
end
private
...
...
app/views/import/gitlab_projects/status.html.haml
浏览文件 @
07ab6c2e
-
page_title
"Gitlab_project import"
-
header_title
"Projects"
,
root_path
%h3
.page-title
%i
.icon-gitlab.icon-gitlab-big
Import Gitlab projects
%p
.light
Select projects you want to import.
%hr
%p
=
button_tag
class:
"btn btn-import btn-success js-import-all"
do
Import all projects
=
icon
(
"spinner spin"
,
class:
"loading-icon"
)
.table-responsive
%table
.table.import-jobs
%colgroup
.import-jobs-from-col
%colgroup
.import-jobs-to-col
%colgroup
.import-jobs-status-col
%thead
%tr
%th
From Gitlab_project.org
%th
To GitLab
%th
Status
%tbody
-
@already_added_projects
.
each
do
|
project
|
%tr
{
id:
"project_#{project.id}"
,
class:
"#{project_status_css_class(project.import_status)}"
}
%td
=
link_to
project
.
import_source
,
"https://gitlab_project.org/
#{
project
.
import_source
}
"
,
target:
"_blank"
%td
=
link_to
project
.
path_with_namespace
,
[
project
.
namespace
.
becomes
(
Namespace
),
project
]
%td
.job-status
-
if
project
.
import_status
==
'finished'
%span
%i
.fa.fa-check
done
-
elsif
project
.
import_status
==
'started'
%i
.fa.fa-spinner.fa-spin
started
-
else
=
project
.
human_import_status_name
-
@repos
.
each
do
|
repo
|
%tr
{
id:
"repo_#{repo.id}"
}
%td
=
link_to
repo
.
full_name
,
"https://gitlab_project.org/
#{
repo
.
full_name
}
"
,
target:
"_blank"
%td
.import-target
=
repo
.
full_name
%td
.import-actions.job-status
=
button_tag
class:
"btn btn-import js-add-to-import"
do
Import
=
icon
(
"spinner spin"
,
class:
"loading-icon"
)
:javascript
new
ImporterStatus
(
"
#{
jobs_import_gitlab_project_path
}
"
,
"
#{
import_gitlab_project_path
}
"
);
lib/gitlab/import_export/command_line_util.rb
浏览文件 @
07ab6c2e
...
...
@@ -9,7 +9,7 @@ module Gitlab
untar_with_options
(
archive:
archive
,
dir:
dir
,
options:
'zxf'
)
end
def
untar_
cz
f
(
archive
:,
dir
:)
def
untar_
x
f
(
archive
:,
dir
:)
untar_with_options
(
archive:
archive
,
dir:
dir
,
options:
'xf'
)
end
...
...
lib/gitlab/import_export/import_service.rb
浏览文件 @
07ab6c2e
...
...
@@ -15,8 +15,7 @@ module Gitlab
def
execute
Gitlab
::
ImportExport
::
Importer
.
import
(
archive_file:
@archive_file
,
storage_path:
storage_path
)
restore_project_tree
restore_repo
project_tree
.
project
if
[
restore_project_tree
,
restore_repo
].
all?
end
private
...
...
lib/gitlab/import_export/repo_restorer.rb
浏览文件 @
07ab6c2e
...
...
@@ -15,7 +15,7 @@ module Gitlab
FileUtils
.
mkdir_p
(
repos_path
)
FileUtils
.
mkdir_p
(
path_to_repo
)
untar_
z
xf
(
archive:
@path
,
dir:
path_to_repo
)
untar_xf
(
archive:
@path
,
dir:
path_to_repo
)
end
private
...
...
spec/features/projects/import_export/import_file_spec.rb
浏览文件 @
07ab6c2e
...
...
@@ -8,6 +8,8 @@ feature 'project import', feature: true, js: true do
let
(
:file
)
{
File
.
join
(
Rails
.
root
,
'spec'
,
'features'
,
'projects'
,
'import_export'
,
'test_project_export.tar.gz'
)
}
background
do
export_path
=
"
#{
Dir
::
tmpdir
}
/import_file_spec"
allow_any_instance_of
(
Gitlab
::
ImportExport
).
to
receive
(
:storage_path
).
and_return
(
export_path
)
login_as
(
user
)
end
...
...
@@ -27,9 +29,6 @@ feature 'project import', feature: true, js: true do
sleep
1
click_on
'Continue to the next step'
sleep
1
end
def
drop_in_dropzone
(
file_path
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录