diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-08 12:56:17 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-08 12:56:17 +0000 |
commit | b51e4cb35871e5b2ae9e09350087ea8b7b3e8c11 (patch) | |
tree | 53c0148e0e3d8e85f451d904f5f740b59e9d697e /lib | |
parent | 685e261f0a9f2495b29e552489e174987101f1f9 (diff) | |
parent | 5195999ea61cc8168363d784dc8e0e7d4c333804 (diff) | |
download | gitlab-ce-b51e4cb35871e5b2ae9e09350087ea8b7b3e8c11.tar.gz |
Merge branch 'fix/29093' into 'master'
Fix 'Object not found - no match for id (sha)' when importing GitHub PRs
Closes #29093
See merge request !9751
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/github_import/branch_formatter.rb | 2 |
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 0a8d05b5fe1..5d29e698b27 100644 --- a/lib/gitlab/github_import/branch_formatter.rb +++ b/lib/gitlab/github_import/branch_formatter.rb @@ -18,7 +18,7 @@ module Gitlab end def commit_exists? - project.repository.commit(sha).present? + project.repository.branch_names_contains(sha).include?(ref) end def short_id |