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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
589c8d56
Commit
589c8d56
authored
Sep 12, 2019
by
Samantha Ming
Committed by
Kushal Pandya
Sep 12, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hide resolve thread button from guest
- Show if user can_resolve all of the notes
parent
42b8e683
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
29 additions
and
1 deletion
+29
-1
app/assets/javascripts/notes/components/discussion_actions.vue
...ssets/javascripts/notes/components/discussion_actions.vue
+8
-1
changelogs/unreleased/62122-hide-resolve-thread-button-from-guest.yml
...nreleased/62122-hide-resolve-thread-button-from-guest.yml
+5
-0
spec/frontend/notes/components/discussion_actions_spec.js
spec/frontend/notes/components/discussion_actions_spec.js
+9
-0
spec/javascripts/notes/components/noteable_discussion_spec.js
.../javascripts/notes/components/noteable_discussion_spec.js
+4
-0
spec/javascripts/notes/mock_data.js
spec/javascripts/notes/mock_data.js
+3
-0
No files found.
app/assets/javascripts/notes/components/discussion_actions.vue
View file @
589c8d56
...
...
@@ -35,6 +35,13 @@ export default {
required
:
true
,
},
},
computed
:
{
userCanResolveDiscussion
()
{
return
this
.
discussion
.
notes
.
every
(
note
=>
note
.
current_user
&&
note
.
current_user
.
can_resolve
,
);
},
},
};
</
script
>
...
...
@@ -46,7 +53,7 @@ export default {
@
onClick=
"$emit('showReplyForm')"
/>
<div
class=
"btn-group discussion-actions"
role=
"group"
>
<div
v-if=
"userCanResolveDiscussion"
class=
"btn-group discussion-actions"
role=
"group"
>
<div
class=
"btn-group"
>
<resolve-discussion-button
v-if=
"discussion.resolvable"
...
...
changelogs/unreleased/62122-hide-resolve-thread-button-from-guest.yml
0 → 100644
View file @
589c8d56
---
title
:
Hide resolve thread button from guest
merge_request
:
32859
author
:
type
:
changed
spec/frontend/notes/components/discussion_actions_spec.js
View file @
589c8d56
...
...
@@ -65,6 +65,15 @@ describe('DiscussionActions', () => {
expect
(
wrapper
.
find
(
JumpToNextDiscussionButton
).
exists
()).
toBe
(
false
);
});
it
(
'
does not renders discussion button for non-member
'
,
()
=>
{
const
discussion
=
JSON
.
parse
(
JSON
.
stringify
(
discussionMock
));
discussion
.
notes
[
1
].
current_user
.
can_resolve
=
false
;
createComponent
({
discussion
});
expect
(
wrapper
.
find
(
ResolveDiscussionButton
).
exists
()).
toBe
(
false
);
expect
(
wrapper
.
find
(
ResolveWithIssueButton
).
exists
()).
toBe
(
false
);
});
});
describe
(
'
events handling
'
,
()
=>
{
...
...
spec/javascripts/notes/components/noteable_discussion_spec.js
View file @
589c8d56
...
...
@@ -255,6 +255,10 @@ describe('noteable_discussion component', () => {
discussion
.
notes
=
discussion
.
notes
.
map
(
note
=>
({
...
note
,
resolved
:
false
,
current_user
:
{
...
note
.
current_user
,
can_resolve
:
true
,
},
}));
wrapper
.
setProps
({
discussion
});
...
...
spec/javascripts/notes/mock_data.js
View file @
589c8d56
...
...
@@ -200,6 +200,7 @@ export const discussionMock = {
current_user
:
{
can_edit
:
true
,
can_award_emoji
:
true
,
can_resolve
:
true
,
},
discussion_id
:
'
9e3bd2f71a01de45fd166e6719eb380ad9f270b1
'
,
emoji_awardable
:
true
,
...
...
@@ -246,6 +247,7 @@ export const discussionMock = {
current_user
:
{
can_edit
:
true
,
can_award_emoji
:
true
,
can_resolve
:
true
,
},
discussion_id
:
'
9e3bd2f71a01de45fd166e6719eb380ad9f270b1
'
,
emoji_awardable
:
true
,
...
...
@@ -292,6 +294,7 @@ export const discussionMock = {
current_user
:
{
can_edit
:
true
,
can_award_emoji
:
true
,
can_resolve
:
true
,
},
discussion_id
:
'
9e3bd2f71a01de45fd166e6719eb380ad9f270b1
'
,
emoji_awardable
:
true
,
...
...
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