Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
46cc034e
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,发现更多精彩内容 >>
提交
46cc034e
编写于
7月 25, 2016
作者:
D
Douwe Maan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add resolved_at and resolved_by_id to DiffNote
上级
44ad0743
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
38 addition
and
1 deletion
+38
-1
app/models/diff_note.rb
app/models/diff_note.rb
+13
-0
app/models/note.rb
app/models/note.rb
+12
-0
db/migrate/20160724205507_add_resolved_to_notes.rb
db/migrate/20160724205507_add_resolved_to_notes.rb
+10
-0
db/schema.rb
db/schema.rb
+3
-1
未找到文件。
app/models/diff_note.rb
浏览文件 @
46cc034e
...
...
@@ -4,11 +4,14 @@ class DiffNote < Note
serialize
:original_position
,
Gitlab
::
Diff
::
Position
serialize
:position
,
Gitlab
::
Diff
::
Position
belongs_to
:resolved_by
,
class_name:
"User"
validates
:original_position
,
presence:
true
validates
:position
,
presence:
true
validates
:diff_line
,
presence:
true
validates
:line_code
,
presence:
true
,
line_code:
true
validates
:noteable_type
,
inclusion:
{
in:
[
'Commit'
,
'MergeRequest'
]
}
validates
:resolved_by
,
presence:
true
,
if: :resolved?
validate
:positions_complete
validate
:verify_supported
...
...
@@ -72,6 +75,16 @@ class DiffNote < Note
self
.
position
.
diff_refs
==
diff_refs
end
def
resolvable?
!
system
?
&&
!
for_commit?
end
def
resolved?
return
false
unless
resolvable?
self
.
resolved_at
.
present?
end
private
def
supported?
...
...
app/models/note.rb
浏览文件 @
46cc034e
...
...
@@ -128,6 +128,18 @@ class Note < ActiveRecord::Base
true
end
def
resolvable?
false
end
def
resolved?
false
end
def
to_be_resolved?
resolvable?
&&
!
resolved?
end
def
discussion_id
@discussion_id
||=
if
for_merge_request?
...
...
db/migrate/20160724205507_add_resolved_to_notes.rb
0 → 100644
浏览文件 @
46cc034e
class
AddResolvedToNotes
<
ActiveRecord
::
Migration
include
Gitlab
::
Database
::
MigrationHelpers
DOWNTIME
=
false
def
change
add_column
:notes
,
:resolved_at
,
:datetime
add_column
:notes
,
:resolved_by_id
,
:integer
end
end
db/schema.rb
浏览文件 @
46cc034e
...
...
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
version:
2016072
1081015
)
do
ActiveRecord
::
Schema
.
define
(
version:
2016072
4205507
)
do
# These are extensions that must be enabled in order to support this database
enable_extension
"plpgsql"
...
...
@@ -705,6 +705,8 @@ ActiveRecord::Schema.define(version: 20160721081015) do
t
.
string
"type"
t
.
text
"position"
t
.
text
"original_position"
t
.
datetime
"resolved_at"
t
.
integer
"resolved_by_id"
end
add_index
"notes"
,
[
"author_id"
],
name:
"index_notes_on_author_id"
,
using: :btree
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录