Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
401b51f7
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,发现更多精彩内容 >>
提交
401b51f7
编写于
2月 23, 2017
作者:
S
Sean McGivern
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'fix-mr-size-with-over-100-files' into 'master'
Fix MR changes tab size count Closes #27563 See merge request !9091
上级
fae2650c
5a2c6881
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
53 addition
and
1 deletion
+53
-1
app/models/merge_request.rb
app/models/merge_request.rb
+5
-1
changelogs/unreleased/fix-mr-size-with-over-100-files.yml
changelogs/unreleased/fix-mr-size-with-over-100-files.yml
+4
-0
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+44
-0
未找到文件。
app/models/merge_request.rb
浏览文件 @
401b51f7
...
...
@@ -203,7 +203,11 @@ class MergeRequest < ActiveRecord::Base
end
def
diff_size
opts
=
diff_options
||
{}
# The `#diffs` method ends up at an instance of a class inheriting from
# `Gitlab::Diff::FileCollection::Base`, so use those options as defaults
# here too, to get the same diff size without performing highlighting.
#
opts
=
Gitlab
::
Diff
::
FileCollection
::
Base
.
default_options
.
merge
(
diff_options
||
{})
raw_diffs
(
opts
).
size
end
...
...
changelogs/unreleased/fix-mr-size-with-over-100-files.yml
0 → 100644
浏览文件 @
401b51f7
---
title
:
Fix MR changes tab size count when there are over 100 files in the diff
merge_request
:
author
:
spec/models/merge_request_spec.rb
浏览文件 @
401b51f7
...
...
@@ -209,6 +209,50 @@ describe MergeRequest, models: true do
end
end
describe
'#diff_size'
do
let
(
:merge_request
)
do
build
(
:merge_request
,
source_branch:
'expand-collapse-files'
,
target_branch:
'master'
)
end
context
'when there are MR diffs'
do
before
do
merge_request
.
save
end
it
'returns the correct count'
do
expect
(
merge_request
.
diff_size
).
to
eq
(
105
)
end
it
'does not perform highlighting'
do
expect
(
Gitlab
::
Diff
::
Highlight
).
not_to
receive
(
:new
)
merge_request
.
diff_size
end
end
context
'when there are no MR diffs'
do
before
do
merge_request
.
compare
=
CompareService
.
new
(
merge_request
.
source_project
,
merge_request
.
source_branch
).
execute
(
merge_request
.
target_project
,
merge_request
.
target_branch
)
end
it
'returns the correct count'
do
expect
(
merge_request
.
diff_size
).
to
eq
(
105
)
end
it
'does not perform highlighting'
do
expect
(
Gitlab
::
Diff
::
Highlight
).
not_to
receive
(
:new
)
merge_request
.
diff_size
end
end
end
describe
"#related_notes"
do
let!
(
:merge_request
)
{
create
(
:merge_request
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录