Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
projects.thm.de
GitLab
Commits
b58a2e30
Commit
b58a2e30
authored
Jan 22, 2016
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Wrap errors on GitHub importer to raise Projects::ImportService::Error
parent
c0403234
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
7 deletions
+12
-7
lib/gitlab/bitbucket_import/importer.rb
lib/gitlab/bitbucket_import/importer.rb
+2
-0
lib/gitlab/github_import/importer.rb
lib/gitlab/github_import/importer.rb
+10
-7
No files found.
lib/gitlab/bitbucket_import/importer.rb
View file @
b58a2e30
...
...
@@ -16,6 +16,8 @@ def execute
import_issues
if
has_issues?
true
rescue
ActiveRecord
::
RecordInvalid
=>
e
raise
Projects
::
ImportService
::
Error
.
new
,
e
.
message
ensure
Gitlab
::
BitbucketImport
::
KeyDeleter
.
new
(
project
).
execute
end
...
...
lib/gitlab/github_import/importer.rb
View file @
b58a2e30
...
...
@@ -35,8 +35,8 @@ def import_issues
end
true
rescue
ActiveRecord
::
RecordInvalid
fals
e
rescue
ActiveRecord
::
RecordInvalid
=>
e
raise
Projects
::
ImportService
::
Error
,
e
.
messag
e
end
def
import_pull_requests
...
...
@@ -53,8 +53,8 @@ def import_pull_requests
end
true
rescue
ActiveRecord
::
RecordInvalid
fals
e
rescue
ActiveRecord
::
RecordInvalid
=>
e
raise
Projects
::
ImportService
::
Error
,
e
.
messag
e
end
def
import_comments
(
issue_number
,
noteable
)
...
...
@@ -83,10 +83,13 @@ def import_wiki
true
rescue
Gitlab
::
Shell
::
Error
=>
e
if
e
.
message
=~
/repository not exported/
true
# GitHub error message when the wiki repo has not been created,
# this means that repo has wiki enabled, but have no pages. So,
# we can skip the import.
if
e
.
message
!~
/repository not exported/
raise
Projects
::
ImportService
::
Error
,
e
.
message
else
fals
e
tru
e
end
end
end
...
...
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