Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
c3782d20
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
c3782d20
编写于
2月 05, 2019
作者:
J
Jan Provaznik
提交者:
Douglas Barbosa Alexandre
2月 12, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove fast_destroy_uploads feature flag
Fast destroy of uploads was successfully enabled and test.
上级
453dec0a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
9 addition
and
50 deletion
+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
未找到文件。
app/models/concerns/with_uploads.rb
浏览文件 @
c3782d20
...
...
@@ -27,40 +27,14 @@ module WithUploads
included
do
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
# option on :file_uploads
before_destroy
:remove_file_uploads
use_fast_destroy
:file_uploads
,
if: :fast_destroy_enabled?
use_fast_destroy
:file_uploads
end
def
retrieve_upload
(
_identifier
,
paths
)
uploads
.
find_by
(
path:
paths
)
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
changelogs/unreleased/fast-destroy-uploads.yml
0 → 100644
浏览文件 @
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
浏览文件 @
c3782d20
...
...
@@ -44,26 +44,6 @@ shared_examples_for 'model with uploads' do |supports_fileuploads|
model_object
.
destroy
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
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录