diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-07-16 16:02:55 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-07-16 16:02:55 +0000 |
| commit | 8048f99c21d0299313dcda172aae22fda8c519d3 (patch) | |
| tree | edf02d0adf376ee0cce7caa9c541c687bc25f43f /lib/gitlab/import_export/avatar_saver.rb | |
| parent | 815947bf6785e1c458bad8d2d891e99279cab602 (diff) | |
| parent | 2c5e6b272e7984400ac4d297553b3f4f50a8d5c4 (diff) | |
| download | gitlab-ce-sliaquat/gitlab-ce-qa-48464-add-edit-delete-file-scenario.tar.gz | |
Merge branch 'master' into 'qa-48464-add-edit-delete-file-scenario'sliaquat/gitlab-ce-qa-48464-add-edit-delete-file-scenario
# Conflicts:
# qa/qa.rb
Diffstat (limited to 'lib/gitlab/import_export/avatar_saver.rb')
| -rw-r--r-- | lib/gitlab/import_export/avatar_saver.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/gitlab/import_export/avatar_saver.rb b/lib/gitlab/import_export/avatar_saver.rb index 998c21e2586..31ef0490cb3 100644 --- a/lib/gitlab/import_export/avatar_saver.rb +++ b/lib/gitlab/import_export/avatar_saver.rb @@ -11,7 +11,12 @@ module Gitlab def save return true unless @project.avatar.exists? - copy_files(avatar_path, avatar_export_path) + Gitlab::ImportExport::UploadsManager.new( + project: @project, + shared: @shared, + relative_export_path: 'avatar', + from: avatar_path + ).save rescue => e @shared.error(e) false @@ -19,10 +24,6 @@ module Gitlab private - def avatar_export_path - File.join(@shared.export_path, 'avatar', @project.avatar_identifier) - end - def avatar_path @project.avatar.path end |