summaryrefslogtreecommitdiff
path: root/app/workers
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-08-04 12:21:53 +0000
committerRémy Coutable <remy@rymai.me>2016-08-04 12:21:53 +0000
commitb2d142c4a026b479925482c4756172d86888198b (patch)
treeb5854516e6ddea3d06279e145548b7ea1c3b6c8d /app/workers
parentf4c79d6a84defb6ffae7d29a5c9a81fbc413f16c (diff)
parent9772cd893eba9493037da572df39a3bfb992af59 (diff)
downloadgitlab-ce-b2d142c4a026b479925482c4756172d86888198b.tar.gz
Merge branch 'fix/ha-mode-import-issue' into 'master'
Fix Import/Export not working in HA mode Use a shared path instead of `Tempfile` default `/tmp` so the import file is accessible by any GitLab instance. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20506 - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5618
Diffstat (limited to 'app/workers')
-rw-r--r--app/workers/import_export_project_cleanup_worker.rb (renamed from app/workers/gitlab_remove_project_export_worker.rb)4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/workers/gitlab_remove_project_export_worker.rb b/app/workers/import_export_project_cleanup_worker.rb
index 1d91897d520..72e3a9ae734 100644
--- a/app/workers/gitlab_remove_project_export_worker.rb
+++ b/app/workers/import_export_project_cleanup_worker.rb
@@ -1,9 +1,9 @@
-class GitlabRemoveProjectExportWorker
+class ImportExportProjectCleanupWorker
include Sidekiq::Worker
sidekiq_options queue: :default
def perform
- Project.remove_gitlab_exports!
+ ImportExportCleanUpService.new.execute
end
end