Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
cdc81e75
Commit
cdc81e75
authored
Apr 12, 2020
by
Rajendra Kadam
Committed by
Peter Leitzen
Apr 12, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move prepend to last line in app workers and uploaders
parent
6c39d8d1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
6 deletions
+11
-6
app/uploaders/object_storage.rb
app/uploaders/object_storage.rb
+2
-2
app/workers/repository_check/batch_worker.rb
app/workers/repository_check/batch_worker.rb
+2
-2
app/workers/repository_check/single_repository_worker.rb
app/workers/repository_check/single_repository_worker.rb
+2
-2
changelogs/unreleased/app-uploaders-workers.yml
changelogs/unreleased/app-uploaders-workers.yml
+5
-0
No files found.
app/uploaders/object_storage.rb
View file @
cdc81e75
...
...
@@ -137,8 +137,6 @@ module ObjectStorage
included
do
|
base
|
base
.
include
(
ObjectStorage
)
include_if_ee
(
'::EE::ObjectStorage::Concern'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
after
:migrate
,
:delete_migrated_file
end
...
...
@@ -463,3 +461,5 @@ module ObjectStorage
end
end
end
ObjectStorage
::
Concern
.
include_if_ee
(
'::EE::ObjectStorage::Concern'
)
app/workers/repository_check/batch_worker.rb
View file @
cdc81e75
...
...
@@ -2,8 +2,6 @@
module
RepositoryCheck
class
BatchWorker
# rubocop:disable Scalability/IdempotentWorker
prepend_if_ee
(
'::EE::RepositoryCheck::BatchWorker'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
include
ApplicationWorker
include
RepositoryCheckQueue
include
ExclusiveLeaseGuard
...
...
@@ -94,3 +92,5 @@ module RepositoryCheck
end
end
end
RepositoryCheck
::
BatchWorker
.
prepend_if_ee
(
'::EE::RepositoryCheck::BatchWorker'
)
app/workers/repository_check/single_repository_worker.rb
View file @
cdc81e75
...
...
@@ -5,8 +5,6 @@ module RepositoryCheck
include
ApplicationWorker
include
RepositoryCheckQueue
prepend_if_ee
(
'::EE::RepositoryCheck::SingleRepositoryWorker'
)
# rubocop: disable Cop/InjectEnterpriseEditionModule
def
perform
(
project_id
)
project
=
Project
.
find
(
project_id
)
healthy
=
project_healthy?
(
project
)
...
...
@@ -68,3 +66,5 @@ module RepositoryCheck
end
end
end
RepositoryCheck
::
SingleRepositoryWorker
.
prepend_if_ee
(
'::EE::RepositoryCheck::SingleRepositoryWorker'
)
changelogs/unreleased/app-uploaders-workers.yml
0 → 100644
View file @
cdc81e75
---
title
:
Move prepend to last line in app workers and uploaders
merge_request
:
29379
author
:
Rajendra Kadam
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment