kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Rémy Coutable 2016-06-20 08:23:20 +00:00
parent 98cede7ebe d5b3a266e8
commit 44b8b77e02
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/projects/import_export/export_service.rb
View File

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

2
lib/gitlab/import_export.rb
View File

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