Commit 44b8b77e authored by Rémy Coutable's avatar Rémy Coutable 🔴

Merge branch 'fix/import-export-prod' into 'master'

Fixed a couple of errors on import/export spotted in production

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18828 and https://gitlab.com/gitlab-org/gitlab-ce/issues/18829

A couple of tiny bugs spotted after deploying in prod

See merge request !4782
parents 98cede7e d5b3a266
......@@ -50,7 +50,7 @@ module Projects
end
def notify_error
notification_service.project_not_exported(@project, @current_user, @shared.errors.join(', '))
notification_service.project_not_exported(@project, @current_user, @shared.errors)
end
end
end
......
......@@ -21,7 +21,7 @@ module Gitlab
end
def config_file
'lib/gitlab/import_export/import_export.yml'
Rails.root.join('lib/gitlab/import_export/import_export.yml')
end
def version_filename
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment