summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2016-12-01 18:22:24 +0000
committerSean McGivern <sean@mcgivern.me.uk>2016-12-01 18:22:24 +0000
commitab54a183a266099664c08489560c0784481595df (patch)
tree06bd9a98d6c4adc0237fd04534cd3932442d1f45 /lib
parent9e8df307e1aba45aba3521bb9aa4dff528205b6e (diff)
parent20720d6aac157207b7ce31edf1ab7a1cd2be6853 (diff)
downloadgitlab-ce-ab54a183a266099664c08489560c0784481595df.tar.gz
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
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/github_import/branch_formatter.rb2
1 files changed, 1 insertions, 1 deletions
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