Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
3ae5f790
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,发现更多精彩内容 >>
提交
3ae5f790
编写于
11月 01, 2017
作者:
F
Felipe Artur
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Render 404 when polling commit notes without having permissions
上级
bfb5107a
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
20 addition
and
1 deletion
+20
-1
app/controllers/concerns/notes_actions.rb
app/controllers/concerns/notes_actions.rb
+2
-1
changelogs/unreleased/issue_39176.yml
changelogs/unreleased/issue_39176.yml
+5
-0
spec/controllers/projects/notes_controller_spec.rb
spec/controllers/projects/notes_controller_spec.rb
+13
-0
未找到文件。
app/controllers/concerns/notes_actions.rb
浏览文件 @
3ae5f790
...
@@ -4,6 +4,7 @@ module NotesActions
...
@@ -4,6 +4,7 @@ module NotesActions
included
do
included
do
before_action
:set_polling_interval_header
,
only:
[
:index
]
before_action
:set_polling_interval_header
,
only:
[
:index
]
before_action
:noteable
,
only: :index
before_action
:authorize_admin_note!
,
only:
[
:update
,
:destroy
]
before_action
:authorize_admin_note!
,
only:
[
:update
,
:destroy
]
before_action
:note_project
,
only:
[
:create
]
before_action
:note_project
,
only:
[
:create
]
end
end
...
@@ -188,7 +189,7 @@ module NotesActions
...
@@ -188,7 +189,7 @@ module NotesActions
end
end
def
noteable
def
noteable
@noteable
||=
notes_finder
.
target
@noteable
||=
notes_finder
.
target
||
render_404
end
end
def
last_fetched_at
def
last_fetched_at
...
...
changelogs/unreleased/issue_39176.yml
0 → 100644
浏览文件 @
3ae5f790
---
title
:
Render 404 when polling commit notes without having permissions
merge_request
:
author
:
type
:
fixed
spec/controllers/projects/notes_controller_spec.rb
浏览文件 @
3ae5f790
...
@@ -105,6 +105,19 @@ describe Projects::NotesController do
...
@@ -105,6 +105,19 @@ describe Projects::NotesController do
expect
(
note_json
[
:discussion_html
]).
to
be_nil
expect
(
note_json
[
:discussion_html
]).
to
be_nil
expect
(
note_json
[
:diff_discussion_html
]).
to
be_nil
expect
(
note_json
[
:diff_discussion_html
]).
to
be_nil
end
end
context
'when user cannot read commit'
do
before
do
allow
(
Ability
).
to
receive
(
:allowed?
).
and_call_original
allow
(
Ability
).
to
receive
(
:allowed?
).
with
(
user
,
:download_code
,
project
).
and_return
(
false
)
end
it
'renders 404'
do
get
:index
,
params
expect
(
response
).
to
have_gitlab_http_status
(
404
)
end
end
end
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录