Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/services/import/github_service.rb')
-rw-r--r--app/services/import/github_service.rb11
1 files changed, 10 insertions, 1 deletions
diff --git a/app/services/import/github_service.rb b/app/services/import/github_service.rb
index 2aaab88e778..061543b5885 100644
--- a/app/services/import/github_service.rb
+++ b/app/services/import/github_service.rb
@@ -10,7 +10,7 @@ module Import
def execute(access_params, provider)
if blocked_url?
- return log_and_return_error("Invalid URL: #{url}", :bad_request)
+ return log_and_return_error("Invalid URL: #{url}", _("Invalid URL: %{url}") % { url: url }, :bad_request)
end
unless authorized?
@@ -119,6 +119,15 @@ module Import
error(_('Import failed due to a GitHub error: %{original}') % { original: exception.response_body }, :unprocessable_entity)
end
+
+ def log_and_return_error(message, translated_message, http_status)
+ Gitlab::GithubImport::Logger.error(
+ message: 'Error while attempting to import from GitHub',
+ error: message
+ )
+
+ error(translated_message, http_status)
+ end
end
end