Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
39ee707c
Commit
39ee707c
authored
Mar 28, 2018
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't show Jump to Discussion button on issue notes
parent
092445a4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
7 deletions
+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
No files found.
app/assets/javascripts/notes/components/noteable_discussion.vue
View file @
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
View file @
39ee707c
---
title
:
Don't show Jump to Discussion button on Issues
merge_request
:
author
:
type
:
fixed
spec/javascripts/notes/components/noteable_discussion_spec.js
View file @
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
();
});
});
});
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment