Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
9a15b112
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,发现更多精彩内容 >>
提交
9a15b112
编写于
5月 19, 2017
作者:
A
Alexis Reigel
提交者:
Rémy Coutable
5月 19, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes the 500 for custom apearance header logo and logo
上级
dda66953
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
46 addition
and
0 deletion
+46
-0
app/controllers/uploads_controller.rb
app/controllers/uploads_controller.rb
+2
-0
changelogs/unreleased/fix-allow-accessing-appearance-images.yml
...logs/unreleased/fix-allow-accessing-appearance-images.yml
+4
-0
spec/controllers/uploads_controller_spec.rb
spec/controllers/uploads_controller_spec.rb
+40
-0
未找到文件。
app/controllers/uploads_controller.rb
浏览文件 @
9a15b112
...
@@ -21,6 +21,8 @@ class UploadsController < ApplicationController
...
@@ -21,6 +21,8 @@ class UploadsController < ApplicationController
can?
(
current_user
,
:read_project
,
model
.
project
)
can?
(
current_user
,
:read_project
,
model
.
project
)
when
User
when
User
true
true
when
Appearance
true
else
else
permission
=
"read_
#{
model
.
class
.
to_s
.
underscore
}
"
.
to_sym
permission
=
"read_
#{
model
.
class
.
to_s
.
underscore
}
"
.
to_sym
...
...
changelogs/unreleased/fix-allow-accessing-appearance-images.yml
0 → 100644
浏览文件 @
9a15b112
---
title
:
Fixes the 500 when accessing customized appearance logos
merge_request
:
11479
author
:
Alexis Reigel
spec/controllers/uploads_controller_spec.rb
浏览文件 @
9a15b112
...
@@ -473,5 +473,45 @@ describe UploadsController do
...
@@ -473,5 +473,45 @@ describe UploadsController do
end
end
end
end
end
end
context
'Appearance'
do
context
'when viewing a custom header logo'
do
let!
(
:appearance
)
{
create
:appearance
,
header_logo:
fixture_file_upload
(
Rails
.
root
.
join
(
'spec/fixtures/dk.png'
),
'image/png'
)
}
context
'when not signed in'
do
it
'responds with status 200'
do
get
:show
,
model:
'appearance'
,
mounted_as:
'header_logo'
,
id:
appearance
.
id
,
filename:
'dk.png'
expect
(
response
).
to
have_http_status
(
200
)
end
it_behaves_like
'content not cached without revalidation'
do
subject
do
get
:show
,
model:
'appearance'
,
mounted_as:
'header_logo'
,
id:
appearance
.
id
,
filename:
'dk.png'
response
end
end
end
end
context
'when viewing a custom logo'
do
let!
(
:appearance
)
{
create
:appearance
,
logo:
fixture_file_upload
(
Rails
.
root
.
join
(
'spec/fixtures/dk.png'
),
'image/png'
)
}
context
'when not signed in'
do
it
'responds with status 200'
do
get
:show
,
model:
'appearance'
,
mounted_as:
'logo'
,
id:
appearance
.
id
,
filename:
'dk.png'
expect
(
response
).
to
have_http_status
(
200
)
end
it_behaves_like
'content not cached without revalidation'
do
subject
do
get
:show
,
model:
'appearance'
,
mounted_as:
'logo'
,
id:
appearance
.
id
,
filename:
'dk.png'
response
end
end
end
end
end
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录