Fix validation method for Gitlab::GithubImport::PullRequestFormatter

2 files changed, 6 insertions, 3 deletions

diff --git a/lib/gitlab/github_import/branch_formatter.rb b/lib/gitlab/github_import/branch_formatter.rb
index f968ec4b102..a15fc84b418 100644
--- a/lib/gitlab/github_import/branch_formatter.rb
+++ b/lib/gitlab/github_import/branch_formatter.rb
@@ -15,6 +15,10 @@ module Gitlab
         repo.present?
       end
 
+      def valid?
+        repo.present?
+      end
+
       private
 
       def short_id
diff --git a/lib/gitlab/github_import/pull_request_formatter.rb b/lib/gitlab/github_import/pull_request_formatter.rb
index 361d15d991c..574737b31c1 100644
--- a/lib/gitlab/github_import/pull_request_formatter.rb
+++ b/lib/gitlab/github_import/pull_request_formatter.rb
@@ -29,7 +29,7 @@ module Gitlab
       end
 
       def valid?
-        !cross_project?
+        source_branch.valid? && target_branch.valid? && !cross_project?
       end
 
       def source_branch
@@ -65,8 +65,7 @@ module Gitlab
       end
 
       def cross_project?
-        source_branch_repo.present? && target_branch_repo.present? &&
-          source_branch_repo.id != target_branch_repo.id
+        source_branch_repo.id != target_branch_repo.id
       end
 
       def description