Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
8c161d7b
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,发现更多精彩内容 >>
提交
8c161d7b
编写于
4月 07, 2017
作者:
D
Douwe Maan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix bug where commit comment would not show up in the right discussion on the MR page
上级
d80f9036
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
11 deletion
+11
-11
app/models/discussion.rb
app/models/discussion.rb
+9
-9
app/models/note.rb
app/models/note.rb
+2
-2
未找到文件。
app/models/discussion.rb
浏览文件 @
8c161d7b
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
class
Discussion
class
Discussion
include
ResolvableDiscussion
include
ResolvableDiscussion
attr_reader
:notes
,
:noteable
attr_reader
:notes
,
:
context_
noteable
delegate
:created_at
,
delegate
:created_at
,
:project
,
:project
,
...
@@ -16,12 +16,12 @@ class Discussion
...
@@ -16,12 +16,12 @@ class Discussion
to: :first_note
to: :first_note
def
self
.
build
(
notes
,
noteable
=
nil
)
def
self
.
build
(
notes
,
context_
noteable
=
nil
)
notes
.
first
.
discussion_class
(
noteable
).
new
(
notes
,
noteable
)
notes
.
first
.
discussion_class
(
context_noteable
).
new
(
notes
,
context_
noteable
)
end
end
def
self
.
build_collection
(
notes
,
noteable
=
nil
)
def
self
.
build_collection
(
notes
,
context_
noteable
=
nil
)
notes
.
group_by
{
|
n
|
n
.
discussion_id
(
noteable
)
}.
values
.
map
{
|
notes
|
build
(
notes
,
noteable
)
}
notes
.
group_by
{
|
n
|
n
.
discussion_id
(
context_noteable
)
}.
values
.
map
{
|
notes
|
build
(
notes
,
context_
noteable
)
}
end
end
# Returns an alphanumeric discussion ID based on `build_discussion_id`
# Returns an alphanumeric discussion ID based on `build_discussion_id`
...
@@ -60,14 +60,14 @@ class Discussion
...
@@ -60,14 +60,14 @@ class Discussion
DiscussionNote
DiscussionNote
end
end
def
initialize
(
notes
,
noteable
=
nil
)
def
initialize
(
notes
,
context_
noteable
=
nil
)
@notes
=
notes
@notes
=
notes
@
noteable
=
noteable
@
context_noteable
=
context_
noteable
end
end
def
==
(
other
)
def
==
(
other
)
other
.
class
==
self
.
class
&&
other
.
class
==
self
.
class
&&
other
.
noteable
==
self
.
noteable
&&
other
.
context_noteable
==
self
.
context_
noteable
&&
other
.
id
==
self
.
id
&&
other
.
id
==
self
.
id
&&
other
.
notes
==
self
.
notes
other
.
notes
==
self
.
notes
end
end
...
@@ -81,7 +81,7 @@ class Discussion
...
@@ -81,7 +81,7 @@ class Discussion
end
end
def
id
def
id
first_note
.
discussion_id
(
noteable
)
first_note
.
discussion_id
(
context_
noteable
)
end
end
alias_method
:to_param
,
:id
alias_method
:to_param
,
:id
...
...
app/models/note.rb
浏览文件 @
8c161d7b
...
@@ -102,8 +102,8 @@ class Note < ActiveRecord::Base
...
@@ -102,8 +102,8 @@ class Note < ActiveRecord::Base
ActiveModel
::
Name
.
new
(
self
,
nil
,
'note'
)
ActiveModel
::
Name
.
new
(
self
,
nil
,
'note'
)
end
end
def
discussions
(
noteable
=
nil
)
def
discussions
(
context_
noteable
=
nil
)
Discussion
.
build_collection
(
fresh
,
noteable
)
Discussion
.
build_collection
(
fresh
,
context_
noteable
)
end
end
def
find_discussion
(
discussion_id
)
def
find_discussion
(
discussion_id
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录