Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
ba2d7eda
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 搜索 >>
提交
ba2d7eda
编写于
1月 30, 2017
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Improve search within group logic
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
fae9814e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
10 addition
and
2 deletion
+10
-2
app/models/project.rb
app/models/project.rb
+1
-0
app/services/search/global_service.rb
app/services/search/global_service.rb
+1
-2
spec/models/project_spec.rb
spec/models/project_spec.rb
+8
-0
未找到文件。
app/models/project.rb
浏览文件 @
ba2d7eda
...
...
@@ -225,6 +225,7 @@ class Project < ActiveRecord::Base
scope
:with_project_feature
,
->
{
joins
(
'LEFT JOIN project_features ON projects.id = project_features.project_id'
)
}
scope
:with_statistics
,
->
{
includes
(
:statistics
)
}
scope
:with_shared_runners
,
->
{
where
(
shared_runners_enabled:
true
)
}
scope
:inside_path
,
->
(
path
)
{
joins
(
:route
).
where
(
'routes.path LIKE ?'
,
"
#{
path
}
/%"
)
}
# "enabled" here means "not disabled". It includes private features!
scope
:with_feature_enabled
,
->
(
feature
)
{
...
...
app/services/search/global_service.rb
浏览文件 @
ba2d7eda
...
...
@@ -11,8 +11,7 @@ module Search
projects
=
ProjectsFinder
.
new
.
execute
(
current_user
)
if
group
ids
=
group
.
descendants
.
push
(
group
.
id
)
projects
=
projects
.
in_namespace
(
ids
)
projects
=
projects
.
inside_path
(
group
.
full_path
)
end
Gitlab
::
SearchResults
.
new
(
current_user
,
projects
,
params
[
:search
])
...
...
spec/models/project_spec.rb
浏览文件 @
ba2d7eda
...
...
@@ -1833,6 +1833,14 @@ describe Project, models: true do
end
end
describe
'inside_path'
do
let!
(
:project1
)
{
create
(
:empty_project
)
}
let!
(
:project2
)
{
create
(
:empty_project
)
}
let!
(
:path
)
{
project1
.
namespace
.
path
}
it
{
expect
(
Project
.
inside_path
(
path
)).
to
eq
([
project1
])
}
end
def
enable_lfs
allow
(
Gitlab
.
config
.
lfs
).
to
receive
(
:enabled
).
and_return
(
true
)
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录