diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-01-21 15:35:27 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-01-21 15:35:27 +0000 |
| commit | 597d3bbe41dc27e113c860e7f0fa2febae7a1caf (patch) | |
| tree | ea16c1b0546988b8a3c5d6f441eb96bcbe0d160e | |
| parent | 268fb004c9917dfcbd4451354e4859ddff44005e (diff) | |
| parent | 4861b1bbfbd962416452e1e883c67b885678b5a0 (diff) | |
| download | gitlab-ce-597d3bbe41dc27e113c860e7f0fa2febae7a1caf.tar.gz | |
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
| -rw-r--r-- | lib/gitlab/github_import/importer.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb index 18929b9113b..663402e8197 100644 --- a/lib/gitlab/github_import/importer.rb +++ b/lib/gitlab/github_import/importer.rb @@ -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 |