Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
8c4a3c77
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 搜索 >>
提交
8c4a3c77
编写于
11月 30, 2015
作者:
M
Minsik Yoon
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add ignore whitespace change option to commit view
上级
d73d2a5e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
22 addition
and
1 deletion
+22
-1
CHANGELOG
CHANGELOG
+1
-0
app/controllers/projects/commit_controller.rb
app/controllers/projects/commit_controller.rb
+6
-1
spec/controllers/commit_controller_spec.rb
spec/controllers/commit_controller_spec.rb
+15
-0
未找到文件。
CHANGELOG
浏览文件 @
8c4a3c77
...
...
@@ -7,6 +7,7 @@ v 8.3.0 (unreleased)
- Fix 500 error when update group member permission
- Fix: Raw private snippets access workflow
- Trim leading and trailing whitespace of milestone and issueable titles (Jose Corcuera)
- Add ignore whitespace change option to commit view
v 8.2.1
- Forcefully update builds that didn't want to update with state machine
...
...
app/controllers/projects/commit_controller.rb
浏览文件 @
8c4a3c77
...
...
@@ -67,7 +67,12 @@ class Projects::CommitController < Projects::ApplicationController
end
def
define_show_vars
@diffs
=
commit
.
diffs
if
params
[
:w
].
to_i
==
1
@diffs
=
commit
.
diffs
({
ignore_whitespace_change:
true
})
else
@diffs
=
commit
.
diffs
end
@notes_count
=
commit
.
notes
.
count
@builds
=
ci_commit
.
builds
if
ci_commit
...
...
spec/controllers/commit_controller_spec.rb
浏览文件 @
8c4a3c77
...
...
@@ -69,6 +69,21 @@ describe Projects::CommitController do
expect
(
response
.
body
).
to
start_with
(
"diff --git"
)
end
it
"should really only be a git diff without whitespace changes"
do
get
(
:show
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
.
to_param
,
id:
'66eceea0db202bb39c4e445e8ca28689645366c5'
,
# id: commit.id,
format:
format
,
w:
1
)
expect
(
response
.
body
).
to
start_with
(
"diff --git"
)
# without whitespace option, there are more than 2 diff_splits
diff_splits
=
assigns
(
:diffs
)[
0
].
diff
.
split
(
"
\n
"
)
expect
(
diff_splits
.
length
).
to
be
<=
2
end
end
describe
"as patch"
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录