Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
f0bdf5c6
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,发现更多精彩内容 >>
提交
f0bdf5c6
编写于
3月 29, 2016
作者:
A
Alfredo Sumaran
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Hide whitespace toggle button for new merge requests
上级
d8d00b5b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
7 addition
and
5 deletion
+7
-5
app/views/projects/diffs/_diffs.html.haml
app/views/projects/diffs/_diffs.html.haml
+6
-4
app/views/projects/merge_requests/_new_submit.html.haml
app/views/projects/merge_requests/_new_submit.html.haml
+1
-1
未找到文件。
app/views/projects/diffs/_diffs.html.haml
浏览文件 @
f0bdf5c6
-
show_whitespace_toggle
=
local_assigns
.
fetch
:show_whitespace_toggle
,
true
-
if
diff_view
==
'parallel'
-
fluid_layout
true
...
...
@@ -5,10 +6,11 @@
.content-block.oneline-block.files-changed
.inline-parallel-buttons
-
if
current_controller?
(
:commit
)
=
commit_diff_whitespace_link
(
@project
,
@commit
)
-
if
current_controller?
(
:merge_requests
)
=
diff_merge_request_whitespace_link
(
@project
,
@merge_request
)
-
if
show_whitespace_toggle
-
if
current_controller?
(
:commit
)
=
commit_diff_whitespace_link
(
@project
,
@commit
)
-
if
current_controller?
(
:merge_requests
)
=
diff_merge_request_whitespace_link
(
@project
,
@merge_request
)
.btn-group
=
inline_diff_btn
=
parallel_diff_btn
...
...
app/views/projects/merge_requests/_new_submit.html.haml
浏览文件 @
f0bdf5c6
...
...
@@ -42,7 +42,7 @@
%h4
This comparison includes more than
#{
MergeRequestDiff
::
COMMITS_SAFE_SIZE
}
commits.
%p
To preserve performance the line changes are not shown.
-
else
=
render
"projects/diffs/diffs"
,
diffs:
@diffs
,
project:
@project
,
diff_refs:
@merge_request
.
diff_refs
=
render
"projects/diffs/diffs"
,
diffs:
@diffs
,
project:
@project
,
diff_refs:
@merge_request
.
diff_refs
,
show_whitespace_toggle:
false
-
if
@ci_commit
#builds
.builds.tab-pane
=
render
"projects/merge_requests/show/builds"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录