Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
16e1b439
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 搜索 >>
未验证
提交
16e1b439
编写于
3月 18, 2019
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove diff tree filtering feature flag
上级
a52d7dfa
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
38 deletion
+18
-38
app/assets/javascripts/diffs/components/tree_list.vue
app/assets/javascripts/diffs/components/tree_list.vue
+18
-34
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+0
-1
locale/gitlab.pot
locale/gitlab.pot
+0
-3
未找到文件。
app/assets/javascripts/diffs/components/tree_list.vue
浏览文件 @
16e1b439
...
...
@@ -30,8 +30,9 @@ export default {
filteredTreeList
()
{
const
search
=
this
.
search
.
toLowerCase
().
trim
();
if
(
search
===
''
||
this
.
$options
.
fuzzyFileFinderEnabled
)
if
(
search
===
''
)
{
return
this
.
renderTreeList
?
this
.
tree
:
this
.
allBlobs
;
}
return
this
.
allBlobs
.
reduce
((
acc
,
folder
)
=>
{
const
tree
=
folder
.
tree
.
filter
(
f
=>
f
.
path
.
toLowerCase
().
indexOf
(
search
)
>=
0
);
...
...
@@ -51,13 +52,11 @@ export default {
},
},
methods
:
{
...
mapActions
(
'
diffs
'
,
[
'
toggleTreeOpen
'
,
'
scrollToFile
'
,
'
toggleFileFinder
'
]),
...
mapActions
(
'
diffs
'
,
[
'
toggleTreeOpen
'
,
'
scrollToFile
'
]),
clearSearch
()
{
this
.
search
=
''
;
},
},
shortcutKeyCharacter
:
`
${
/
Mac
/
i
.
test
(
navigator
.
userAgent
)
?
'
⌘
'
:
'
Ctrl
'
}
+P`
,
diffTreeFiltering
:
gon
.
features
&&
gon
.
features
.
diffTreeFiltering
,
};
</
script
>
...
...
@@ -66,36 +65,21 @@ export default {
<div
class=
"append-bottom-8 position-relative tree-list-search d-flex"
>
<div
class=
"flex-fill d-flex"
>
<icon
name=
"search"
class=
"position-absolute tree-list-icon"
/>
<template
v-if=
"$options.diffTreeFiltering"
>
<input
v-model=
"search"
:placeholder=
"s__('MergeRequest|Filter files')"
type=
"search"
class=
"form-control"
/>
<button
v-show=
"search"
:aria-label=
"__('Clear search')"
type=
"button"
class=
"position-absolute bg-transparent tree-list-icon tree-list-clear-icon border-0 p-0"
@
click=
"clearSearch"
>
<icon
name=
"close"
/>
</button>
</
template
>
<
template
v-else
>
<button
type=
"button"
class=
"form-control text-left text-secondary"
@
click=
"toggleFileFinder(true)"
>
{{
s__
(
'
MergeRequest|Search files
'
)
}}
</button>
<span
class=
"position-absolute text-secondary diff-tree-search-shortcut"
v-html=
"$options.shortcutKeyCharacter"
></span>
</
template
>
<input
v-model=
"search"
:placeholder=
"s__('MergeRequest|Filter files')"
type=
"search"
class=
"form-control"
/>
<button
v-show=
"search"
:aria-label=
"__('Clear search')"
type=
"button"
class=
"position-absolute bg-transparent tree-list-icon tree-list-clear-icon border-0 p-0"
@
click=
"clearSearch"
>
<icon
name=
"close"
/>
</button>
</div>
</div>
<div
:class=
"
{ 'pt-0 tree-list-blobs': !renderTreeList }" class="tree-list-scroll">
...
...
app/controllers/projects/merge_requests_controller.rb
浏览文件 @
16e1b439
...
...
@@ -17,7 +17,6 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
before_action
:check_user_can_push_to_source_branch!
,
only:
[
:rebase
]
before_action
only:
[
:show
]
do
push_frontend_feature_flag
(
:diff_tree_filtering
,
default_enabled:
true
)
push_frontend_feature_flag
(
:expand_diff_full_file
)
end
...
...
locale/gitlab.pot
浏览文件 @
16e1b439
...
...
@@ -4872,9 +4872,6 @@ msgstr ""
msgid "MergeRequest|No files found"
msgstr ""
msgid "MergeRequest|Search files"
msgstr ""
msgid "Merged"
msgstr ""
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录