Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
1a424a9b
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 搜索 >>
提交
1a424a9b
编写于
5月 23, 2017
作者:
V
Valery Sizov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Explicitly test that guest is able to search through the wiki
上级
7487d06c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
10 addition
and
4 deletion
+10
-4
app/helpers/search_helper.rb
app/helpers/search_helper.rb
+6
-0
app/views/search/_category.html.haml
app/views/search/_category.html.haml
+1
-1
spec/lib/gitlab/project_search_results_spec.rb
spec/lib/gitlab/project_search_results_spec.rb
+2
-2
spec/services/search_service_spec.rb
spec/services/search_service_spec.rb
+1
-1
未找到文件。
app/helpers/search_helper.rb
浏览文件 @
1a424a9b
...
...
@@ -33,6 +33,12 @@ module SearchHelper
def
parse_search_result
(
result
)
Gitlab
::
ProjectSearchResults
.
parse_search_result
(
result
)
end
def
show_notes_tab?
[
:read_merge_request
,
:download_code
,
:read_issue
,
:read_project_snippet
].
all?
do
|
ability
|
can?
(
current_user
,
:read_merge_request
,
@project
)
end
end
private
...
...
app/views/search/_category.html.haml
浏览文件 @
1a424a9b
...
...
@@ -27,7 +27,7 @@
Milestones
%span
.badge
=
@search_results
.
milestones_count
-
if
can?
(
current_user
,
:read_merge_request
,
@project
)
||
can?
(
current_user
,
:read_issue
,
@project
)
-
if
show_notes_tab?
%li
{
class:
active_when
(
@scope
==
'notes'
)
}
=
link_to
search_filter_path
(
scope:
'notes'
)
do
Comments
...
...
spec/lib/gitlab/project_search_results_spec.rb
浏览文件 @
1a424a9b
...
...
@@ -123,8 +123,8 @@ describe Gitlab::ProjectSearchResults, lib: true do
context
'when wiki is internal'
do
let
(
:project
)
{
create
(
:project
,
:public
,
:wiki_private
)
}
it
'finds wiki blobs for
members
'
do
project
.
add_
reporter
(
user
)
it
'finds wiki blobs for
guest
'
do
project
.
add_
guest
(
user
)
is_expected
.
not_to
be_empty
end
...
...
spec/services/search_service_spec.rb
浏览文件 @
1a424a9b
...
...
@@ -29,7 +29,7 @@ describe SearchService, services: true do
it
'returns the project for guests'
do
search_project
=
create
:empty_project
search_project
.
team
<<
[
user
,
:guest
]
search_project
.
add_guest
(
user
)
project
=
SearchService
.
new
(
user
,
project_id:
search_project
.
id
).
project
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录