Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
839589fd
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,体验更适合开发者的 AI 搜索 >>
提交
839589fd
编写于
3月 11, 2018
作者:
F
Fabian Schneider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Change avatar error message to include allowed file formats
上级
afd2d381
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
9 addition
and
10 deletion
+9
-10
app/models/concerns/avatarable.rb
app/models/concerns/avatarable.rb
+1
-1
app/models/group.rb
app/models/group.rb
+0
-6
changelogs/unreleased/43771-improve-avatar-error-message.yml
changelogs/unreleased/43771-improve-avatar-error-message.yml
+5
-0
spec/models/group_spec.rb
spec/models/group_spec.rb
+1
-1
spec/models/project_spec.rb
spec/models/project_spec.rb
+1
-1
spec/models/user_spec.rb
spec/models/user_spec.rb
+1
-1
未找到文件。
app/models/concerns/avatarable.rb
浏览文件 @
839589fd
...
...
@@ -21,7 +21,7 @@ module Avatarable
def
avatar_type
unless
self
.
avatar
.
image?
self
.
errors
.
add
:avatar
,
"only images allowed
"
errors
.
add
:avatar
,
"file format is not supported. Please try one of the following supported formats:
#{
AvatarUploader
::
IMAGE_EXT
.
join
(
', '
)
}
"
end
end
...
...
app/models/group.rb
浏览文件 @
839589fd
...
...
@@ -189,12 +189,6 @@ class Group < Namespace
owners
.
include?
(
user
)
&&
owners
.
size
==
1
end
def
avatar_type
unless
self
.
avatar
.
image?
self
.
errors
.
add
:avatar
,
"only images allowed"
end
end
def
post_create_hook
Gitlab
::
AppLogger
.
info
(
"Group
\"
#{
name
}
\"
was created"
)
...
...
changelogs/unreleased/43771-improve-avatar-error-message.yml
0 → 100644
浏览文件 @
839589fd
---
title
:
Change avatar error message to include allowed file formats
merge_request
:
17747
author
:
Fabian Schneider
type
:
changed
spec/models/group_spec.rb
浏览文件 @
839589fd
...
...
@@ -240,7 +240,7 @@ describe Group do
it
"is false if avatar is html page"
do
group
.
update_attribute
(
:avatar
,
'uploads/avatar.html'
)
expect
(
group
.
avatar_type
).
to
eq
([
"
only images allowed
"
])
expect
(
group
.
avatar_type
).
to
eq
([
"
file format is not supported. Please try one of the following supported formats: png, jpg, jpeg, gif, bmp, tiff
"
])
end
end
...
...
spec/models/project_spec.rb
浏览文件 @
839589fd
...
...
@@ -922,7 +922,7 @@ describe Project do
it
'is false if avatar is html page'
do
project
.
update_attribute
(
:avatar
,
'uploads/avatar.html'
)
expect
(
project
.
avatar_type
).
to
eq
([
'
only images allowed
'
])
expect
(
project
.
avatar_type
).
to
eq
([
'
file format is not supported. Please try one of the following supported formats: png, jpg, jpeg, gif, bmp, tiff
'
])
end
end
...
...
spec/models/user_spec.rb
浏览文件 @
839589fd
...
...
@@ -1222,7 +1222,7 @@ describe User do
it
'is false if avatar is html page'
do
user
.
update_attribute
(
:avatar
,
'uploads/avatar.html'
)
expect
(
user
.
avatar_type
).
to
eq
([
'
only images allowed
'
])
expect
(
user
.
avatar_type
).
to
eq
([
'
file format is not supported. Please try one of the following supported formats: png, jpg, jpeg, gif, bmp, tiff
'
])
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录