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

Merge branch 'fix/import-export-prod' into 'master'
44b8b77e · Rémy Coutable · 98cede7e · d5b3a266 · 44b8b77e · 44b8b77e
Commit 44b8b77e authored Jun 20, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

export_service.rb app/services/projects/import_export/export_service.rb +1 -1

import_export.rb lib/gitlab/import_export.rb +1 -1

No files found.
--- 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

--- 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