Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
ec273b8d
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,发现更多精彩内容 >>
提交
ec273b8d
编写于
1月 02, 2017
作者:
J
Jacob Vosmaer
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Copy, don't move uploaded avatar files
上级
8dc2163c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
32 addition
and
4 deletion
+32
-4
app/uploaders/avatar_uploader.rb
app/uploaders/avatar_uploader.rb
+11
-0
changelogs/unreleased/project-avatar-fork.yml
changelogs/unreleased/project-avatar-fork.yml
+4
-0
spec/services/projects/fork_service_spec.rb
spec/services/projects/fork_service_spec.rb
+13
-0
spec/uploaders/avatar_uploader_spec.rb
spec/uploaders/avatar_uploader_spec.rb
+4
-4
未找到文件。
app/uploaders/avatar_uploader.rb
浏览文件 @
ec273b8d
...
@@ -10,4 +10,15 @@ class AvatarUploader < GitlabUploader
...
@@ -10,4 +10,15 @@ class AvatarUploader < GitlabUploader
def
exists?
def
exists?
model
.
avatar
.
file
&&
model
.
avatar
.
file
.
exists?
model
.
avatar
.
file
&&
model
.
avatar
.
file
.
exists?
end
end
# We set move_to_store and move_to_cache to 'false' to prevent stealing
# the avatar file from a project when forking it.
# https://gitlab.com/gitlab-org/gitlab-ce/issues/26158
def
move_to_store
false
end
def
move_to_cache
false
end
end
end
changelogs/unreleased/project-avatar-fork.yml
0 → 100644
浏览文件 @
ec273b8d
---
title
:
Copy, don't move uploaded avatar files
merge_request
:
8396
author
:
spec/services/projects/fork_service_spec.rb
浏览文件 @
ec273b8d
...
@@ -5,10 +5,12 @@ describe Projects::ForkService, services: true do
...
@@ -5,10 +5,12 @@ describe Projects::ForkService, services: true do
before
do
before
do
@from_namespace
=
create
(
:namespace
)
@from_namespace
=
create
(
:namespace
)
@from_user
=
create
(
:user
,
namespace:
@from_namespace
)
@from_user
=
create
(
:user
,
namespace:
@from_namespace
)
avatar
=
fixture_file_upload
(
Rails
.
root
+
"spec/fixtures/dk.png"
,
"image/png"
)
@from_project
=
create
(
:project
,
@from_project
=
create
(
:project
,
creator_id:
@from_user
.
id
,
creator_id:
@from_user
.
id
,
namespace:
@from_namespace
,
namespace:
@from_namespace
,
star_count:
107
,
star_count:
107
,
avatar:
avatar
,
description:
'wow such project'
)
description:
'wow such project'
)
@to_namespace
=
create
(
:namespace
)
@to_namespace
=
create
(
:namespace
)
@to_user
=
create
(
:user
,
namespace:
@to_namespace
)
@to_user
=
create
(
:user
,
namespace:
@to_namespace
)
...
@@ -36,6 +38,17 @@ describe Projects::ForkService, services: true do
...
@@ -36,6 +38,17 @@ describe Projects::ForkService, services: true do
it
{
expect
(
to_project
.
namespace
).
to
eq
(
@to_user
.
namespace
)
}
it
{
expect
(
to_project
.
namespace
).
to
eq
(
@to_user
.
namespace
)
}
it
{
expect
(
to_project
.
star_count
).
to
be_zero
}
it
{
expect
(
to_project
.
star_count
).
to
be_zero
}
it
{
expect
(
to_project
.
description
).
to
eq
(
@from_project
.
description
)
}
it
{
expect
(
to_project
.
description
).
to
eq
(
@from_project
.
description
)
}
it
{
expect
(
to_project
.
avatar
.
file
).
to
be_exists
}
# This test is here because we had a bug where the from-project lost its
# avatar after being forked.
# https://gitlab.com/gitlab-org/gitlab-ce/issues/26158
it
"after forking the from-project still has its avatar"
do
# If we do not fork the project first we cannot detect the bug.
expect
(
to_project
).
to
be_persisted
expect
(
@from_project
.
avatar
.
file
).
to
be_exists
end
end
end
end
end
...
...
spec/uploaders/avatar_uploader_spec.rb
浏览文件 @
ec273b8d
...
@@ -5,14 +5,14 @@ describe AvatarUploader do
...
@@ -5,14 +5,14 @@ describe AvatarUploader do
subject
{
described_class
.
new
(
user
)
}
subject
{
described_class
.
new
(
user
)
}
describe
'#move_to_cache'
do
describe
'#move_to_cache'
do
it
'is
tru
e'
do
it
'is
fals
e'
do
expect
(
subject
.
move_to_cache
).
to
eq
(
tru
e
)
expect
(
subject
.
move_to_cache
).
to
eq
(
fals
e
)
end
end
end
end
describe
'#move_to_store'
do
describe
'#move_to_store'
do
it
'is
tru
e'
do
it
'is
fals
e'
do
expect
(
subject
.
move_to_store
).
to
eq
(
tru
e
)
expect
(
subject
.
move_to_store
).
to
eq
(
fals
e
)
end
end
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录