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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
c3782d20
Commit
c3782d20
authored
Feb 05, 2019
by
Jan Provaznik
Committed by
Douglas Barbosa Alexandre
Feb 12, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove fast_destroy_uploads feature flag
Fast destroy of uploads was successfully enabled and test.
parent
453dec0a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
50 deletions
+9
-50
app/models/concerns/with_uploads.rb
app/models/concerns/with_uploads.rb
+4
-30
changelogs/unreleased/fast-destroy-uploads.yml
changelogs/unreleased/fast-destroy-uploads.yml
+5
-0
spec/support/shared_examples/models/with_uploads_shared_examples.rb
...rt/shared_examples/models/with_uploads_shared_examples.rb
+0
-20
No files found.
app/models/concerns/with_uploads.rb
View file @
c3782d20
...
@@ -27,40 +27,14 @@ module WithUploads
...
@@ -27,40 +27,14 @@ module WithUploads
included
do
included
do
has_many
:uploads
,
as: :model
has_many
:uploads
,
as: :model
has_many
:file_uploads
,
->
{
where
(
uploader:
FILE_UPLOADERS
)
},
class_name:
'Upload'
,
as: :model
has_many
:file_uploads
,
->
{
where
(
uploader:
FILE_UPLOADERS
)
},
class_name:
'Upload'
,
as: :model
,
dependent: :delete_all
# rubocop:disable Cop/ActiveRecordDependent
# TODO: when feature flag is removed, we can use just dependent: destroy
use_fast_destroy
:file_uploads
# option on :file_uploads
before_destroy
:remove_file_uploads
use_fast_destroy
:file_uploads
,
if: :fast_destroy_enabled?
end
end
def
retrieve_upload
(
_identifier
,
paths
)
def
retrieve_upload
(
_identifier
,
paths
)
uploads
.
find_by
(
path:
paths
)
uploads
.
find_by
(
path:
paths
)
end
end
private
# mounted uploads are deleted in carrierwave's after_commit hook,
# but FileUploaders which are not mounted must be deleted explicitly and
# it can not be done in after_commit because FileUploader requires loads
# associated model on destroy (which is already deleted in after_commit)
def
remove_file_uploads
fast_destroy_enabled?
?
delete_uploads
:
destroy_uploads
end
def
delete_uploads
file_uploads
.
delete_all
(
:delete_all
)
end
def
destroy_uploads
file_uploads
.
find_each
do
|
upload
|
upload
.
destroy
end
end
def
fast_destroy_enabled?
Feature
.
enabled?
(
:fast_destroy_uploads
,
self
)
end
end
end
changelogs/unreleased/fast-destroy-uploads.yml
0 → 100644
View file @
c3782d20
---
title
:
File uploads are deleted asynchronously when deleting a project or group.
merge_request
:
author
:
type
:
added
spec/support/shared_examples/models/with_uploads_shared_examples.rb
View file @
c3782d20
...
@@ -44,26 +44,6 @@ shared_examples_for 'model with uploads' do |supports_fileuploads|
...
@@ -44,26 +44,6 @@ shared_examples_for 'model with uploads' do |supports_fileuploads|
model_object
.
destroy
model_object
.
destroy
end
end
end
end
describe
'destroy strategy depending on feature flag'
do
let!
(
:upload
)
{
create
(
:upload
,
uploader:
FileUploader
,
model:
model_object
)
}
it
'does not destroy uploads by default'
do
expect
(
model_object
).
to
receive
(
:delete_uploads
)
expect
(
model_object
).
not_to
receive
(
:destroy_uploads
)
model_object
.
destroy
end
it
'uses before destroy callback if feature flag is disabled'
do
stub_feature_flags
(
fast_destroy_uploads:
false
)
expect
(
model_object
).
to
receive
(
:destroy_uploads
)
expect
(
model_object
).
not_to
receive
(
:delete_uploads
)
model_object
.
destroy
end
end
end
end
end
end
end
end
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