diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-20 08:23:20 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-20 08:23:20 +0000 |
| commit | 44b8b77e02423ce97f9abe80e0335f4f4c453c83 (patch) | |
| tree | 07f964c88d3128ac298c1fcf0c555d8188e71f49 | |
| parent | 98cede7ebeae9dac994b35b66be6aab14eb932b3 (diff) | |
| parent | d5b3a266e878a29e1d37194f7026c8c3d9d7aa55 (diff) | |
| download | gitlab-ce-44b8b77e02423ce97f9abe80e0335f4f4c453c83.tar.gz | |
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
| -rw-r--r-- | app/services/projects/import_export/export_service.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/import_export.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/services/projects/import_export/export_service.rb b/app/services/projects/import_export/export_service.rb index d6752377ce5..80c7193efcb 100644 --- a/app/services/projects/import_export/export_service.rb +++ b/app/services/projects/import_export/export_service.rb @@ -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 diff --git a/lib/gitlab/import_export.rb b/lib/gitlab/import_export.rb index 624c1766024..99cf85d9a3b 100644 --- a/lib/gitlab/import_export.rb +++ b/lib/gitlab/import_export.rb @@ -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 |