Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
a31e9e1e
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,发现更多精彩内容 >>
提交
a31e9e1e
编写于
7月 25, 2016
作者:
D
Douwe Maan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Tweak wording
上级
b3180d34
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
3 addition
and
3 deletion
+3
-3
app/assets/javascripts/line_comments/components/resolve_all.js.coffee
...avascripts/line_comments/components/resolve_all.js.coffee
+1
-1
app/assets/javascripts/line_comments/components/resolve_btn.js.coffee
...avascripts/line_comments/components/resolve_btn.js.coffee
+1
-1
app/views/projects/merge_requests/_discussion.html.haml
app/views/projects/merge_requests/_discussion.html.haml
+1
-1
未找到文件。
app/assets/javascripts/line_comments/components/resolve_all.js.coffee
浏览文件 @
a31e9e1e
...
...
@@ -12,7 +12,7 @@
isResolved
=
false
unless
resolved
isResolved
buttonText
:
->
if
this
.
allResolved
then
"Un
-resolve all"
else
"Resolve all
"
if
this
.
allResolved
then
"Un
resolve discussion"
else
"Resolve discussion
"
loading
:
->
this
.
loadingObject
[
this
.
discussionId
]
methods
:
...
...
app/assets/javascripts/line_comments/components/resolve_btn.js.coffee
浏览文件 @
a31e9e1e
...
...
@@ -9,7 +9,7 @@
loading
:
false
computed
:
buttonText
:
->
if
this
.
isResolved
then
"Mark as un
-
resolved"
else
"Mark as resolved"
if
this
.
isResolved
then
"Mark as unresolved"
else
"Mark as resolved"
isResolved
:
->
CommentsStore
.
get
(
this
.
discussionId
,
this
.
noteId
)
methods
:
updateTooltip
:
->
...
...
app/views/projects/merge_requests/_discussion.html.haml
浏览文件 @
a31e9e1e
...
...
@@ -4,6 +4,6 @@
=
link_to
'Close merge request'
,
merge_request_path
(
@merge_request
,
merge_request:
{
state_event: :close
}),
method: :put
,
class:
"btn btn-nr btn-comment btn-close close-mr-link js-note-target-close"
,
title:
"Close merge request"
,
data:
{
original_text:
"Close merge request"
,
alternative_text:
"Comment & close merge request"
}
-
if
@merge_request
.
closed?
=
link_to
'Reopen merge request'
,
merge_request_path
(
@merge_request
,
merge_request:
{
state_event: :reopen
}),
method: :put
,
class:
"btn btn-nr btn-comment btn-reopen reopen-mr-link js-note-target-reopen"
,
title:
"Reopen merge request"
,
data:
{
original_text:
"Reopen merge request"
,
alternative_text:
"Comment & reopen merge request"
}
=
submit_tag
'Comment & resolve
all
'
,
class:
"btn btn-nr btn-create append-right-10 comment-btn js-comment-resolve-button"
,
data:
{
namespace:
"
#{
@merge_request
.
project
.
namespace
.
path
}
/
#{
@merge_request
.
project
.
path
}
"
}
=
submit_tag
'Comment & resolve
discussion
'
,
class:
"btn btn-nr btn-create append-right-10 comment-btn js-comment-resolve-button"
,
data:
{
namespace:
"
#{
@merge_request
.
project
.
namespace
.
path
}
/
#{
@merge_request
.
project
.
path
}
"
}
#notes
=
render
"projects/notes/notes_with_form"
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录