Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
39ee707c
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,发现更多精彩内容 >>
提交
39ee707c
编写于
3月 28, 2018
作者:
S
Simon Knox
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Don't show Jump to Discussion button on issue notes
上级
092445a4
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
22 addition
and
7 deletion
+22
-7
app/assets/javascripts/notes/components/noteable_discussion.vue
...sets/javascripts/notes/components/noteable_discussion.vue
+4
-2
changelogs/unreleased/44717-no-resolve-issue.yml
changelogs/unreleased/44717-no-resolve-issue.yml
+5
-0
spec/javascripts/notes/components/noteable_discussion_spec.js
.../javascripts/notes/components/noteable_discussion_spec.js
+13
-5
未找到文件。
app/assets/javascripts/notes/components/noteable_discussion.vue
浏览文件 @
39ee707c
...
...
@@ -292,10 +292,12 @@ Please check your network connection and try again.`;
</button>
</div>
<div
v-if=
"note.resolvable"
class=
"btn-group discussion-actions"
role=
"group"
>
role=
"group"
>
<div
v-if=
"
note.resolvable &&
!discussionResolved"
v-if=
"!discussionResolved"
class=
"btn-group"
role=
"group"
>
<a
...
...
changelogs/unreleased/44717-no-resolve-issue.yml
0 → 100644
浏览文件 @
39ee707c
---
title
:
Don't show Jump to Discussion button on Issues
merge_request
:
author
:
type
:
fixed
spec/javascripts/notes/components/noteable_discussion_spec.js
浏览文件 @
39ee707c
...
...
@@ -25,26 +25,34 @@ describe('issue_discussion component', () => {
});
it
(
'
should render user avatar
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.user-avatar-link
'
)).
toBeDefined
();
expect
(
vm
.
$el
.
querySelector
(
'
.user-avatar-link
'
)).
not
.
toBeNull
();
});
it
(
'
should render discussion header
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.discussion-header
'
)).
toBeDefined
();
expect
(
vm
.
$el
.
querySelector
(
'
.discussion-header
'
)).
not
.
toBeNull
();
expect
(
vm
.
$el
.
querySelector
(
'
.notes
'
).
children
.
length
).
toEqual
(
discussionMock
.
notes
.
length
);
});
describe
(
'
actions
'
,
()
=>
{
it
(
'
should render reply button
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.js-vue-discussion-reply
'
).
textContent
.
trim
()).
toEqual
(
'
Reply...
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.js-vue-discussion-reply
'
).
textContent
.
trim
()).
toEqual
(
'
Reply...
'
,
);
});
it
(
'
should toggle reply form
'
,
(
done
)
=>
{
it
(
'
should toggle reply form
'
,
done
=>
{
vm
.
$el
.
querySelector
(
'
.js-vue-discussion-reply
'
).
click
();
Vue
.
nextTick
(()
=>
{
expect
(
vm
.
$refs
.
noteForm
).
toBeDefined
();
expect
(
vm
.
$refs
.
noteForm
).
not
.
toBeNull
();
expect
(
vm
.
isReplying
).
toEqual
(
true
);
done
();
});
});
it
(
'
does not render jump to discussion button
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
*[data-original-title="Jump to next unresolved discussion"]
'
),
).
toBeNull
();
});
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录