Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
iv
gitlab-ce
Commits
fc5f6943
Commit
fc5f6943
authored
Jun 14, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
yay finally importing working with the new services structure
parent
ff44198e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/controllers/import/gitlab_projects_controller.rb
app/controllers/import/gitlab_projects_controller.rb
+1
-1
lib/gitlab/import_export/shared.rb
lib/gitlab/import_export/shared.rb
+2
-2
spec/features/projects/import_export/test_project_export.tar.gz
...eatures/projects/import_export/test_project_export.tar.gz
+0
-0
No files found.
app/controllers/import/gitlab_projects_controller.rb
View file @
fc5f6943
...
@@ -33,7 +33,7 @@ class Import::GitlabProjectsController < Import::BaseController
...
@@ -33,7 +33,7 @@ class Import::GitlabProjectsController < Import::BaseController
private
private
def
file_is_valid?
def
file_is_valid?
project_params
[
:file
].
respond_to?
(
:read
)
&&
project_params
[
:file
].
content_type
==
'application/x-gzip'
project_params
[
:file
].
respond_to?
(
:read
)
end
end
def
verify_project_and_namespace_access
def
verify_project_and_namespace_access
...
...
lib/gitlab/import_export/shared.rb
View file @
fc5f6943
...
@@ -17,13 +17,13 @@ module Gitlab
...
@@ -17,13 +17,13 @@ module Gitlab
error_out
(
error
.
message
,
caller
[
0
].
dup
)
error_out
(
error
.
message
,
caller
[
0
].
dup
)
@errors
<<
error
.
message
@errors
<<
error
.
message
# Debug:
# Debug:
logger
.
error
(
error
.
backtrace
)
Rails
.
logger
.
error
(
error
.
backtrace
)
end
end
private
private
def
error_out
(
message
,
caller
)
def
error_out
(
message
,
caller
)
logger
.
error
(
"Import/Export error raised on
#{
caller
}
:
#{
message
}
"
)
Rails
.
logger
.
error
(
"Import/Export error raised on
#{
caller
}
:
#{
message
}
"
)
end
end
end
end
end
end
...
...
spec/features/projects/import_export/test_project_export.tar.gz
View file @
fc5f6943
No preview for this file type
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment