diff options
| author | James Lopez <james@jameslopez.es> | 2016-06-20 08:58:43 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-06-20 08:58:43 +0200 |
| commit | cee2a2dc66a16695fad28657d6649e861a3c1be8 (patch) | |
| tree | 8950ae98600f1d9b594d8154c502253dcdfcb904 | |
| parent | 98cede7ebeae9dac994b35b66be6aab14eb932b3 (diff) | |
| download | gitlab-ce-cee2a2dc66a16695fad28657d6649e861a3c1be8.tar.gz | |
fixed a couple of errors spotted in production
| -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..4ea7a592c2f 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' + File.join(Rails.root, 'lib/gitlab/import_export/import_export.yml') end def version_filename |