Merge branch 'fix-github-pull-requests-import' into 'master'

Fix cross projects detection when importing GitHub pull requests

Fixes #12456

See merge request !2523

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/gitlab/github_import/pull_request_formatter.rb b/lib/gitlab/github_import/pull_request_formatter.rb
index b7c47958cc7..f96fed0f5cf 100644
--- a/lib/gitlab/github_import/pull_request_formatter.rb
+++ b/lib/gitlab/github_import/pull_request_formatter.rb
@@ -18,7 +18,7 @@ module Gitlab
       end
 
       def cross_project?
-        source_repo.fork == true
+        source_repo.id != target_repo.id
       end
 
       def number
@@ -73,6 +73,10 @@ module Gitlab
         project
       end
 
+      def target_repo
+        raw_data.base.repo
+      end
+
       def target_branch
         target_project.repository.find_branch(raw_data.base.ref)
       end