Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
98450799
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 搜索 >>
提交
98450799
编写于
7月 29, 2016
作者:
F
Felipe Artur
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix search results for notes without commits
上级
ab3dd9a1
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
27 addition
and
2 deletion
+27
-2
CHANGELOG
CHANGELOG
+1
-0
app/views/search/results/_note.html.haml
app/views/search/results/_note.html.haml
+6
-2
spec/features/search_spec.rb
spec/features/search_spec.rb
+20
-0
未找到文件。
CHANGELOG
浏览文件 @
98450799
...
...
@@ -31,6 +31,7 @@ v 8.11.0 (unreleased)
- Check for Ci::Build artifacts at database level on pipeline partial
- Make "New issue" button in Issue page less obtrusive !5457 (winniehell)
- Gitlab::Metrics.current_transaction needs to be public for RailsQueueDuration
- Fix search for notes which belongs to deleted objects
- Add GitLab Workhorse version to admin dashboard (Katarzyna Kobierska Ula Budziszewska)
- Add the `sprockets-es6` gem
- Multiple trigger variables show in separate lines (Katarzyna Kobierska Ula Budziszewska)
...
...
app/views/search/results/_note.html.haml
浏览文件 @
98450799
-
project
=
note
.
project
-
note_url
=
Gitlab
::
UrlBuilder
.
build
(
note
)
-
noteable_identifier
=
note
.
noteable
.
try
(
:iid
)
||
note
.
noteable
.
id
-
noteable_identifier
=
note
.
noteable
.
try
(
:iid
)
||
note
.
noteable
.
try
(
:id
)
.search-result-row
%h5
.note-search-caption.str-truncated
%i
.fa.fa-comment
...
...
@@ -10,7 +11,10 @@
·
-
if
note
.
for_commit?
=
link_to
"Commit
#{
truncate_sha
(
note
.
commit_id
)
}
"
,
note_url
=
link_to_if
(
noteable_identifier
,
"Commit
#{
truncate_sha
(
note
.
commit_id
)
}
"
,
note_url
)
do
=
truncate_sha
(
note
.
commit_id
)
%span
.light
Commit deleted
-
else
%span
#{
note
.
noteable_type
.
titleize
}
##{noteable_identifier}
·
...
...
spec/features/search_spec.rb
浏览文件 @
98450799
...
...
@@ -28,6 +28,26 @@ describe "Search", feature: true do
end
context
'search for comments'
do
context
'when comment belongs to a invalid commit'
do
let
(
:note
)
{
create
(
:note_on_commit
,
author:
user
,
project:
project
,
commit_id:
project
.
repository
.
commit
.
id
,
note:
'Bug here'
)
}
before
{
note
.
update_attributes
(
commit_id:
12345678
)
}
it
'finds comment'
do
visit
namespace_project_path
(
project
.
namespace
,
project
)
page
.
within
'.search'
do
fill_in
'search'
,
with:
note
.
note
click_button
'Go'
end
click_link
'Comments'
expect
(
page
).
to
have_text
(
"Commit deleted"
)
expect
(
page
).
to
have_text
(
"12345678"
)
end
end
it
'finds a snippet'
do
snippet
=
create
(
:project_snippet
,
:private
,
project:
project
,
author:
user
,
title:
'Some title'
)
note
=
create
(
:note
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录