diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-11 03:09:29 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-11 03:09:29 +0300 |
| commit | 9fff1bd2b4287a13862672f2a5a729506063e9ef (patch) | |
| tree | 5e1a24c82ecaaf4e9f21611298629b935329d540 /app | |
| parent | 694fe540a21b9709b3ac2268bceb36516024f4b0 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/clusters/applications/runner.rb | 2 | ||||
| -rw-r--r-- | app/models/project_repository_storage_move.rb | 5 | ||||
| -rw-r--r-- | app/workers/project_update_repository_storage_worker.rb | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/app/models/clusters/applications/runner.rb b/app/models/clusters/applications/runner.rb index 7d67e258991..a861126908f 100644 --- a/app/models/clusters/applications/runner.rb +++ b/app/models/clusters/applications/runner.rb @@ -3,7 +3,7 @@ module Clusters module Applications class Runner < ApplicationRecord - VERSION = '0.15.0' + VERSION = '0.16.1' self.table_name = 'clusters_applications_runners' diff --git a/app/models/project_repository_storage_move.rb b/app/models/project_repository_storage_move.rb index 90da70120f8..8b2ddb22a48 100644 --- a/app/models/project_repository_storage_move.rb +++ b/app/models/project_repository_storage_move.rb @@ -39,8 +39,9 @@ class ProjectRepositoryStorageMove < ApplicationRecord after_transition initial: :scheduled do |storage_move, _| storage_move.run_after_commit do ProjectUpdateRepositoryStorageWorker.perform_async( - storage_move.project_id, storage_move.destination_storage_name, - repository_storage_move_id: storage_move.id + storage_move.project_id, + storage_move.destination_storage_name, + storage_move.id ) end end diff --git a/app/workers/project_update_repository_storage_worker.rb b/app/workers/project_update_repository_storage_worker.rb index 7de75c6a46c..5c1a8062f12 100644 --- a/app/workers/project_update_repository_storage_worker.rb +++ b/app/workers/project_update_repository_storage_worker.rb @@ -5,7 +5,7 @@ class ProjectUpdateRepositoryStorageWorker # rubocop:disable Scalability/Idempot feature_category :gitaly - def perform(project_id, new_repository_storage_key, repository_storage_move_id: nil) + def perform(project_id, new_repository_storage_key, repository_storage_move_id = nil) repository_storage_move = if repository_storage_move_id ProjectRepositoryStorageMove.find(repository_storage_move_id) |