summaryrefslogtreecommitdiff
path: root/lib/github
diff options
context:
space:
mode:
authorAlejandro Rodríguez <alejorro70@gmail.com>2017-10-14 22:52:07 -0300
committerAlejandro Rodríguez <alejorro70@gmail.com>2017-11-03 14:33:24 -0300
commitdea6d054cdf3082651e356875e4a9225933a2383 (patch)
tree3bdbdd89b6d426ed9974cdaf997cacbef6a3e8c5 /lib/github
parent3f0233e5b531b44b2c276c8e8f536af6d2c15db3 (diff)
downloadgitlab-ce-dea6d054cdf3082651e356875e4a9225933a2383.tar.gz
Encapsulate git operations for mirroring in Gitlab::Git
Diffstat (limited to 'lib/github')
-rw-r--r--lib/github/import.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/github/import.rb b/lib/github/import.rb
index 76612799412..8cabbdec940 100644
--- a/lib/github/import.rb
+++ b/lib/github/import.rb
@@ -60,7 +60,9 @@ module Github
project.repository.set_import_remote_as_mirror('github')
project.repository.add_remote_fetch_config('github', '+refs/pull/*/head:refs/merge-requests/*/head')
fetch_remote(forced: true)
- rescue Gitlab::Git::Repository::NoRepository, Gitlab::Shell::Error => e
+ rescue Gitlab::Git::Repository::NoRepository,
+ Gitlab::Git::RepositoryMirroring::RemoteError,
+ Gitlab::Shell::Error => e
error(:project, repo_url, e.message)
raise Github::RepositoryFetchError
end