Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
63d38a30
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 搜索 >>
提交
63d38a30
编写于
4月 24, 2017
作者:
D
Douwe Maan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix commenting on an existing discussion on an unchanged line that is no longer in the diff
上级
1005389f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
15 addition
and
8 deletion
+15
-8
changelogs/unreleased/dm-fix-position-tracer-for-hidden-lines.yml
...gs/unreleased/dm-fix-position-tracer-for-hidden-lines.yml
+5
-0
lib/gitlab/diff/position_tracer.rb
lib/gitlab/diff/position_tracer.rb
+8
-1
spec/lib/gitlab/diff/position_tracer_spec.rb
spec/lib/gitlab/diff/position_tracer_spec.rb
+2
-7
未找到文件。
changelogs/unreleased/dm-fix-position-tracer-for-hidden-lines.yml
0 → 100644
浏览文件 @
63d38a30
---
title
:
Fix commenting on an existing discussion on an unchanged line that is no longer
in the diff
merge_request
:
author
:
lib/gitlab/diff/position_tracer.rb
浏览文件 @
63d38a30
...
...
@@ -82,7 +82,7 @@ module Gitlab
file_diff
,
old_line
,
new_line
=
results
Position
.
new
(
new_position
=
Position
.
new
(
old_path:
file_diff
.
old_path
,
new_path:
file_diff
.
new_path
,
head_sha:
new_diff_refs
.
head_sha
,
...
...
@@ -91,6 +91,13 @@ module Gitlab
old_line:
old_line
,
new_line:
new_line
)
# If a position is found, but is not actually contained in the diff, for example
# because it was an unchanged line in the context of a change that was undone,
# we cannot return this as a successful trace.
return
unless
new_position
.
diff_line
(
repository
)
new_position
end
private
...
...
spec/lib/gitlab/diff/position_tracer_spec.rb
浏览文件 @
63d38a30
...
...
@@ -569,13 +569,8 @@ describe Gitlab::Diff::PositionTracer, lib: true do
# 1 1 BB
# 2 2 A
it
"returns the new position"
do
expect_new_position
(
old_path:
file_name
,
new_path:
new_file_name
,
old_line:
old_position
.
new_line
,
new_line:
old_position
.
new_line
)
it
"returns nil since the line doesn't exist in the new diffs anymore"
do
expect
(
subject
).
to
be_nil
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录