diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-02-19 17:56:33 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-02-19 17:56:33 +0000 |
| commit | 8cfa5ccf5342f98aaf6b0a292d337d3211d5e7ff (patch) | |
| tree | a201fdad620d835b3e7aaf9cdd77c819d1873fc9 /lib | |
| parent | 7511e47f8583d6b5ce2b86c64a70a1616f607e1e (diff) | |
| parent | 69b750aee9f51f1206495531e14c1f9b6d421600 (diff) | |
| download | gitlab-ce-8cfa5ccf5342f98aaf6b0a292d337d3211d5e7ff.tar.gz | |
Merge branch '4826-github-import-wiki-fix-1' into 'master'
[GH Import] Create an empty wiki if wiki import failed
Closes #43020
See merge request gitlab-org/gitlab-ce!17112
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/github_import/importer/repository_importer.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/github_import/importer/repository_importer.rb b/lib/gitlab/github_import/importer/repository_importer.rb index 7dd68a0d1cd..ab0b751fe24 100644 --- a/lib/gitlab/github_import/importer/repository_importer.rb +++ b/lib/gitlab/github_import/importer/repository_importer.rb @@ -63,6 +63,7 @@ module Gitlab true rescue Gitlab::Shell::Error => e if e.message !~ /repository not exported/ + project.create_wiki fail_import("Failed to import the wiki: #{e.message}") else true |