Merge branch 'fix-github-wiki-import' into 'master'

Fix import of GitHub's wiki when the repository has not been created

Fixes #12503 

See merge request !2533
This commit is contained in:
Douwe Maan 2016-01-21 15:35:27 +00:00
commit 597d3bbe41
1 changed files with 6 additions and 2 deletions

View File

@ -82,8 +82,12 @@ module Gitlab
end
true
rescue Gitlab::Shell::Error
false
rescue Gitlab::Shell::Error => e
if e.message =~ /repository not exported/
true
else
false
end
end
end
end