Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
e72aeccd
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,发现更多精彩内容 >>
提交
e72aeccd
编写于
9月 17, 2018
作者:
J
James Lopez
提交者:
Douwe Maan
9月 17, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Resolve "Unable to import repository: undefined method `import_file' for nil:NilClass"
上级
78b3eea7
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
15 addition
and
4 deletion
+15
-4
app/controllers/import/gitlab_projects_controller.rb
app/controllers/import/gitlab_projects_controller.rb
+6
-2
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+1
-1
changelogs/unreleased/50944-unable-to-import-repository-undefined-method-import_file-for-nil-nilclass.yml
...ository-undefined-method-import_file-for-nil-nilclass.yml
+5
-0
spec/controllers/import/gitlab_projects_controller_spec.rb
spec/controllers/import/gitlab_projects_controller_spec.rb
+1
-1
spec/features/projects/import_export/export_file_spec.rb
spec/features/projects/import_export/export_file_spec.rb
+2
-0
未找到文件。
app/controllers/import/gitlab_projects_controller.rb
浏览文件 @
e72aeccd
...
...
@@ -11,7 +11,7 @@ class Import::GitlabProjectsController < Import::BaseController
def
create
unless
file_is_valid?
return
redirect_back_or_default
(
options:
{
alert:
"You need to upload a GitLab project export archive."
})
return
redirect_back_or_default
(
options:
{
alert:
"You need to upload a GitLab project export archive
(ending in .gz)
."
})
end
@project
=
::
Projects
::
GitlabProjectsImportService
.
new
(
current_user
,
project_params
).
execute
...
...
@@ -29,7 +29,11 @@ class Import::GitlabProjectsController < Import::BaseController
private
def
file_is_valid?
project_params
[
:file
]
&&
project_params
[
:file
].
respond_to?
(
:read
)
return
false
unless
project_params
[
:file
]
&&
project_params
[
:file
].
respond_to?
(
:read
)
filename
=
project_params
[
:file
].
original_filename
ImportExportUploader
::
EXTENSION_WHITELIST
.
include?
(
File
.
extname
(
filename
).
delete
(
'.'
))
end
def
verify_gitlab_project_import_enabled
...
...
app/controllers/projects_controller.rb
浏览文件 @
e72aeccd
...
...
@@ -196,7 +196,7 @@ class ProjectsController < Projects::ApplicationController
def
download_export
if
@project
.
export_file_exists?
send_upload
(
@project
.
export_file
)
send_upload
(
@project
.
export_file
,
attachment:
@project
.
export_file
.
filename
)
else
redirect_to
(
edit_project_path
(
@project
,
anchor:
'js-export-project'
),
...
...
changelogs/unreleased/50944-unable-to-import-repository-undefined-method-import_file-for-nil-nilclass.yml
0 → 100644
浏览文件 @
e72aeccd
---
title
:
Fix import error when archive does not have the correct extension
merge_request
:
21765
author
:
type
:
fixed
spec/controllers/import/gitlab_projects_controller_spec.rb
浏览文件 @
e72aeccd
...
...
@@ -3,7 +3,7 @@ require 'spec_helper'
describe
Import
::
GitlabProjectsController
do
set
(
:namespace
)
{
create
(
:namespace
)
}
set
(
:user
)
{
namespace
.
owner
}
let
(
:file
)
{
fixture_file_upload
(
'spec/fixtures/
doc_sample.txt
'
,
'text/plain'
)
}
let
(
:file
)
{
fixture_file_upload
(
'spec/fixtures/
project_export.tar.gz
'
,
'text/plain'
)
}
before
do
sign_in
(
user
)
...
...
spec/features/projects/import_export/export_file_spec.rb
浏览文件 @
e72aeccd
...
...
@@ -49,6 +49,8 @@ describe 'Import/Export - project export integration test', :js do
expect
(
file_permissions
(
project
.
export_path
)).
to
eq
(
0700
)
expect
(
project
.
export_file
.
path
).
to
include
(
'tar.gz'
)
in_directory_with_expanded_export
(
project
)
do
|
exit_status
,
tmpdir
|
expect
(
exit_status
).
to
eq
(
0
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录