Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
4834e2e6
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 搜索 >>
未验证
提交
4834e2e6
编写于
7月 04, 2016
作者:
R
Rémy Coutable
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix diff comments not showing up in activity feed
Signed-off-by:
N
Rémy Coutable
<
remy@rymai.me
>
上级
f60b48bd
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
34 addition
and
3 deletion
+34
-3
CHANGELOG
CHANGELOG
+1
-0
app/models/event.rb
app/models/event.rb
+2
-2
spec/models/event_spec.rb
spec/models/event_spec.rb
+31
-1
未找到文件。
CHANGELOG
浏览文件 @
4834e2e6
...
...
@@ -41,6 +41,7 @@ v 8.9.5 (unreleased)
- Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiq
- Fixes issues importing events in Import/Export. Import/Export version bumped to 0.1.1
- Fix import button disabled when import process fail due to the namespace already been taken.
- Fix diff comments not showing up in activity feed. !5069
- Security: Update RedCloth to 4.3.2 (Takuya Noguchi)
v 8.9.4
...
...
app/models/event.rb
浏览文件 @
4834e2e6
...
...
@@ -67,7 +67,7 @@ class Event < ActiveRecord::Base
elsif
issue?
||
issue_note?
Ability
.
abilities
.
allowed?
(
user
,
:read_issue
,
note?
?
note_target
:
target
)
else
((
merge_request?
||
note?
)
&&
target
)
||
milestone?
((
merge_request?
||
note?
)
&&
target
.
present?
)
||
milestone?
end
end
...
...
@@ -136,7 +136,7 @@ class Event < ActiveRecord::Base
end
def
note?
target_type
==
"Note"
%w[Note LegacyDiffNote]
.
include?
(
target_type
)
end
def
issue?
...
...
spec/models/event_spec.rb
浏览文件 @
4834e2e6
...
...
@@ -46,6 +46,22 @@ describe Event, models: true do
it
{
expect
(
@event
.
author
).
to
eq
(
@user
)
}
end
describe
'#note?'
do
subject
{
Event
.
new
(
project:
target
.
project
,
target:
target
)
}
context
'issue note event'
do
let
(
:target
)
{
create
(
:note_on_issue
)
}
it
{
is_expected
.
to
be_note
}
end
context
'merge request note event'
do
let
(
:target
)
{
create
(
:note_on_merge_request
)
}
it
{
is_expected
.
to
be_note
}
end
end
describe
'#visible_to_user?'
do
let
(
:project
)
{
create
(
:empty_project
,
:public
)
}
let
(
:non_member
)
{
create
(
:user
)
}
...
...
@@ -89,7 +105,7 @@ describe Event, models: true do
end
end
context
'note event'
do
context
'
issue
note event'
do
context
'on non confidential issues'
do
let
(
:target
)
{
note_on_issue
}
...
...
@@ -112,6 +128,20 @@ describe Event, models: true do
it
{
expect
(
event
.
visible_to_user?
(
admin
)).
to
eq
true
}
end
end
context
'merge request note event'
do
let
(
:project
)
{
create
(
:project
,
:public
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
,
author:
author
,
assignee:
assignee
)
}
let
(
:note_on_merge_request
)
{
create
(
:note_on_merge_request
,
noteable:
merge_request
,
project:
project
)
}
let
(
:target
)
{
note_on_merge_request
}
it
{
expect
(
event
.
visible_to_user?
(
non_member
)).
to
eq
true
}
it
{
expect
(
event
.
visible_to_user?
(
author
)).
to
eq
true
}
it
{
expect
(
event
.
visible_to_user?
(
assignee
)).
to
eq
true
}
it
{
expect
(
event
.
visible_to_user?
(
member
)).
to
eq
true
}
it
{
expect
(
event
.
visible_to_user?
(
guest
)).
to
eq
true
}
it
{
expect
(
event
.
visible_to_user?
(
admin
)).
to
eq
true
}
end
end
describe
'.limit_recent'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录