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
2a888700
Commit
2a888700
authored
Mar 09, 2021
by
Yogi
Committed by
Kushal Pandya
Mar 09, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move add reaction button of note to gl-button
parent
5492f611
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
9 deletions
+23
-9
app/assets/javascripts/notes/components/note_actions.vue
app/assets/javascripts/notes/components/note_actions.vue
+16
-7
changelogs/unreleased/gl-button-reaction.yml
changelogs/unreleased/gl-button-reaction.yml
+5
-0
spec/features/issues/user_interacts_with_awards_spec.rb
spec/features/issues/user_interacts_with_awards_spec.rb
+2
-2
No files found.
app/assets/javascripts/notes/components/note_actions.vue
View file @
2a888700
...
@@ -259,19 +259,28 @@ export default {
...
@@ -259,19 +259,28 @@ export default {
class="line-resolve-btn note-action-button"
class="line-resolve-btn note-action-button"
@click="onResolve"
@click="onResolve"
/>
/>
<
a
<
gl-button
v-if=
"canAwardEmoji"
v-if=
"canAwardEmoji"
v-gl-tooltip
v-gl-tooltip
:class=
"
{ 'js-user-authored': isAuthoredByCurrentUser }"
:class=
"
{ 'js-user-authored': isAuthoredByCurrentUser }"
class="note-action-button note-emoji-button js-add-award js-note-emoji gl-text-gray-600 gl-m-2"
class="note-action-button note-emoji-button add-reaction-button js-add-award js-note-emoji"
href="#"
category="tertiary"
variant="default"
size="small"
title="Add reaction"
title="Add reaction"
data-position="right"
data-position="right"
:aria-label="__('Add reaction')"
>
>
<gl-icon
class=
"link-highlight award-control-icon-neutral"
name=
"slight-smile"
/>
<span
class=
"reaction-control-icon reaction-control-icon-neutral"
>
<gl-icon
class=
"link-highlight award-control-icon-positive"
name=
"smiley"
/>
<gl-icon
name=
"slight-smile"
/>
<gl-icon
class=
"link-highlight award-control-icon-super-positive"
name=
"smile"
/>
</span>
</a>
<span
class=
"reaction-control-icon reaction-control-icon-positive"
>
<gl-icon
name=
"smiley"
/>
</span>
<span
class=
"reaction-control-icon reaction-control-icon-super-positive"
>
<gl-icon
name=
"smile"
/>
</span>
</gl-button>
<reply-button
<reply-button
v-if=
"showReply"
v-if=
"showReply"
ref=
"replyButton"
ref=
"replyButton"
...
...
changelogs/unreleased/gl-button-reaction.yml
0 → 100644
View file @
2a888700
---
title
:
Move add reaction button of note to gl-button
merge_request
:
53565
author
:
Yogi (@yo)
type
:
other
spec/features/issues/user_interacts_with_awards_spec.rb
View file @
2a888700
...
@@ -135,7 +135,7 @@ RSpec.describe 'User interacts with awards' do
...
@@ -135,7 +135,7 @@ RSpec.describe 'User interacts with awards' do
it
'allows adding a new emoji'
do
it
'allows adding a new emoji'
do
page
.
within
(
'.note-actions'
)
do
page
.
within
(
'.note-actions'
)
do
find
(
'
a
.js-add-award'
).
click
find
(
'
.btn
.js-add-award'
).
click
end
end
page
.
within
(
'.emoji-menu-content'
)
do
page
.
within
(
'.emoji-menu-content'
)
do
find
(
'gl-emoji[data-name="8ball"]'
).
click
find
(
'gl-emoji[data-name="8ball"]'
).
click
...
@@ -157,7 +157,7 @@ RSpec.describe 'User interacts with awards' do
...
@@ -157,7 +157,7 @@ RSpec.describe 'User interacts with awards' do
end
end
page
.
within
(
'.note-actions'
)
do
page
.
within
(
'.note-actions'
)
do
expect
(
page
).
not_to
have_css
(
'
a
.js-add-award'
)
expect
(
page
).
not_to
have_css
(
'
.btn
.js-add-award'
)
end
end
end
end
...
...
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