Merge branch 'fix/github-importer' into 'master'

Fix GitHub importer to import PR where source repo/fork was renamed/deleted

Closes #24594

See merge request !7865

3 files changed, 14 insertions, 4 deletions

diff --git a/changelogs/unreleased/fix-github-branch-formatter.yml b/changelogs/unreleased/fix-github-branch-formatter.yml
new file mode 100644
index 00000000000..c8698f507de
--- /dev/null
+++ b/changelogs/unreleased/fix-github-branch-formatter.yml
@@ -0,0 +1,4 @@
+---
+title: Fix branch validation for GitHub PR where repo/fork was renamed/deleted
+merge_request: 
+author: 
diff --git a/lib/gitlab/github_import/branch_formatter.rb b/lib/gitlab/github_import/branch_formatter.rb
index 4750675ae9d..0a8d05b5fe1 100644
--- a/lib/gitlab/github_import/branch_formatter.rb
+++ b/lib/gitlab/github_import/branch_formatter.rb
@@ -8,7 +8,7 @@ module Gitlab
       end
 
       def valid?
-        repo.present?
+        sha.present? && ref.present?
       end
 
       private
diff --git a/spec/lib/gitlab/github_import/branch_formatter_spec.rb b/spec/lib/gitlab/github_import/branch_formatter_spec.rb
index e5300dbba1e..462caa5b5fe 100644
--- a/spec/lib/gitlab/github_import/branch_formatter_spec.rb
+++ b/spec/lib/gitlab/github_import/branch_formatter_spec.rb
@@ -49,14 +49,20 @@ describe Gitlab::GithubImport::BranchFormatter, lib: true do
   end
 
   describe '#valid?' do
-    it 'returns true when raw repo is present' do
+    it 'returns true when raw sha and ref are present' do
       branch = described_class.new(project, double(raw))
 
       expect(branch.valid?).to eq true
     end
 
-    it 'returns false when raw repo is blank' do
-      branch = described_class.new(project, double(raw.merge(repo: nil)))
+    it 'returns false when raw sha is blank' do
+      branch = described_class.new(project, double(raw.merge(sha: nil)))
+
+      expect(branch.valid?).to eq false
+    end
+
+    it 'returns false when raw ref is blank' do
+      branch = described_class.new(project, double(raw.merge(ref: nil)))
 
       expect(branch.valid?).to eq false
     end