Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
5ad60c5d
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,发现更多精彩内容 >>
提交
5ad60c5d
编写于
1月 20, 2016
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'secret-shortcut-feature' into 'master'
Adds "t" as a shortcut for find file anywhere See merge request !2507
上级
41c5c391
7377abf8
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
6 addition
and
7 deletion
+6
-7
app/assets/javascripts/dispatcher.js.coffee
app/assets/javascripts/dispatcher.js.coffee
+0
-1
app/assets/javascripts/shortcuts.js.coffee
app/assets/javascripts/shortcuts.js.coffee
+1
-0
app/assets/javascripts/shortcuts_tree.coffee
app/assets/javascripts/shortcuts_tree.coffee
+0
-4
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+3
-0
app/views/projects/find_file/show.html.haml
app/views/projects/find_file/show.html.haml
+1
-1
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+1
-1
未找到文件。
app/assets/javascripts/dispatcher.js.coffee
浏览文件 @
5ad60c5d
...
...
@@ -87,7 +87,6 @@ class Dispatcher
new
GroupAvatar
()
when
'projects:tree:show'
new
TreeView
()
shortcut_handler
=
new
ShortcutsTree
()
when
'projects:find_file:show'
shortcut_handler
=
true
when
'projects:blob:show'
...
...
app/assets/javascripts/shortcuts.js.coffee
浏览文件 @
5ad60c5d
...
...
@@ -4,6 +4,7 @@ class @Shortcuts
Mousetrap
.
reset
()
Mousetrap
.
bind
(
'?'
,
@
selectiveHelp
)
Mousetrap
.
bind
(
's'
,
Shortcuts
.
focusSearch
)
Mousetrap
.
bind
(
't'
,
->
Turbolinks
.
visit
(
findFileURL
))
if
findFileURL
?
selectiveHelp
:
(
e
)
=>
Shortcuts
.
showHelp
(
e
,
@
enabledHelp
)
...
...
app/assets/javascripts/shortcuts_tree.coffee
已删除
100644 → 0
浏览文件 @
41c5c391
class
@
ShortcutsTree
extends
ShortcutsNavigation
constructor
:
->
super
()
Mousetrap
.
bind
(
't'
,
->
ShortcutsTree
.
findAndFollowLink
(
'.shortcuts-find-file'
))
app/views/layouts/header/_default.html.haml
浏览文件 @
5ad60c5d
...
...
@@ -37,3 +37,6 @@
%h1
.title
=
title
=
render
'shared/outdated_browser'
-
if
@project
&&
!
@project
.
empty_repo?
:javascript
var
findFileURL
=
"
#{
namespace_project_find_file_path
(
@project
.
namespace
,
@project
,
@ref
||
@project
.
repository
.
root_ref
)
}
"
;
\ No newline at end of file
app/views/projects/find_file/show.html.haml
浏览文件 @
5ad60c5d
...
...
@@ -10,7 +10,7 @@
=
link_to
namespace_project_tree_path
(
@project
.
namespace
,
@project
,
@ref
)
do
=
@project
.
path
%li
.file-finder
%input
#file_find
.form-control.file-finder-input
{
type:
"text"
,
placeholder:
'Find by path'
}
%input
#file_find
.form-control.file-finder-input
{
type:
"text"
,
placeholder:
'Find by path'
,
autocomplete:
'off'
}
%div
.tree-content-holder
.table-holder
...
...
features/steps/project/merge_requests.rb
浏览文件 @
5ad60c5d
...
...
@@ -41,7 +41,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end
step
'I should not see "master" branch'
do
expect
(
page
).
not_to
have_content
"master"
expect
(
find
(
'.merge-request-info'
)
).
not_to
have_content
"master"
end
step
'I should see "other_branch" branch'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录