Wrap errors on GitHub importer to raise Projects::ImportService::Error

2 files changed, 12 insertions, 7 deletions

diff --git a/lib/gitlab/bitbucket_import/importer.rb b/lib/gitlab/bitbucket_import/importer.rb
index e8c6d89764c..3f483847efa 100644
--- a/lib/gitlab/bitbucket_import/importer.rb
+++ b/lib/gitlab/bitbucket_import/importer.rb
@@ -16,6 +16,8 @@ module Gitlab
         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
diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb
index 663402e8197..e2a85f29825 100644
--- a/lib/gitlab/github_import/importer.rb
+++ b/lib/gitlab/github_import/importer.rb
@@ -35,8 +35,8 @@ module Gitlab
         end
 
         true
-      rescue ActiveRecord::RecordInvalid
-        false
+      rescue ActiveRecord::RecordInvalid => e
+        raise Projects::ImportService::Error, e.message
       end
 
       def import_pull_requests
@@ -53,8 +53,8 @@ module Gitlab
         end
 
         true
-      rescue ActiveRecord::RecordInvalid
-        false
+      rescue ActiveRecord::RecordInvalid => e
+        raise Projects::ImportService::Error, e.message
       end
 
       def import_comments(issue_number, noteable)
@@ -83,10 +83,13 @@ module Gitlab
 
         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
-          false
+          true
         end
       end
     end