Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
bbb926f3
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,发现更多精彩内容 >>
提交
bbb926f3
编写于
6月 20, 2012
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #952 from gitlabhq/remove_link_to_function
Get rid of deprecated link_to_function
上级
6507c108
d5b41831
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
18 addition
and
2 deletion
+18
-2
app/assets/javascripts/application.js
app/assets/javascripts/application.js
+8
-0
app/assets/javascripts/merge_requests.js
app/assets/javascripts/merge_requests.js
+4
-0
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+4
-0
app/views/commits/_text_file.html.haml
app/views/commits/_text_file.html.haml
+1
-1
app/views/merge_requests/_commits.html.haml
app/views/merge_requests/_commits.html.haml
+1
-1
未找到文件。
app/assets/javascripts/application.js
浏览文件 @
bbb926f3
...
...
@@ -53,6 +53,14 @@ $(document).ready(function(){
e
.
preventDefault
();
}
});
/**
* Commit show suppressed diff
*
*/
$
(
"
.supp_diff_link
"
).
bind
(
"
click
"
,
function
()
{
showDiff
(
this
);
});
});
function
focusSearch
()
{
...
...
app/assets/javascripts/merge_requests.js
浏览文件 @
bbb926f3
...
...
@@ -34,6 +34,10 @@ var MergeRequest = {
$
(
"
.merge-request-diffs
"
).
show
();
e
.
preventDefault
();
});
$
(
"
.mr_show_all_commits
"
).
bind
(
"
click
"
,
function
()
{
MergeRequest
.
showAllCommits
();
})
},
showState
:
...
...
app/assets/stylesheets/common.scss
浏览文件 @
bbb926f3
...
...
@@ -602,3 +602,7 @@ li.note {
min-height
:
42px
;
}
.supp_diff_link
,
.mr_show_all_commits
{
cursor
:pointer
;
}
app/views/commits/_text_file.html.haml
浏览文件 @
bbb926f3
-
too_big
=
max_lines
=
diff
.
diff
.
lines
.
count
>
1000
-
if
too_big
=
link_to_function
"Diff suppressed. Click to show"
,
"showDiff(this)"
,
:class
=>
"supp_diff_link"
%a
.supp_diff_link
Diff suppressed. Click to show
%table
{
:class
=>
"#{'hide' if too_big}"
}
-
each_diff_line
(
diff
.
diff
.
lines
.
to_a
,
index
)
do
|
line
,
type
,
line_code
,
line_new
,
line_old
|
...
...
app/views/merge_requests/_commits.html.haml
浏览文件 @
bbb926f3
...
...
@@ -9,7 +9,7 @@
%li
.bottom
8 of
#{
@commits
.
count
}
commits displayed.
%strong
=
link_to_function
"Click here to show all"
,
"MergeRequest.showAllCommits()"
%a
.mr_show_all_commits
Click here to show all
%ul
.all_mr_commits.hide.unstyled
-
@commits
.
each
do
|
commit
|
=
render
"commits/commit"
,
:commit
=>
commit
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录