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
Boxiang Sun
gitlab-ce
Commits
78029952
Commit
78029952
authored
Dec 31, 2018
by
Brandon Labuschagne
Committed by
Fatih Acet
Dec 31, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Status emoji should not update awards section on issue page"
parent
ca14b70d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
2 deletions
+20
-2
app/assets/javascripts/set_status_modal/emoji_menu_in_modal.js
...ssets/javascripts/set_status_modal/emoji_menu_in_modal.js
+1
-2
changelogs/unreleased/52888-status-emoji-should-not-be-added-to-awards-section-on-issue-page-2.yml
...should-not-be-added-to-awards-section-on-issue-page-2.yml
+5
-0
spec/features/profiles/user_edit_profile_spec.rb
spec/features/profiles/user_edit_profile_spec.rb
+14
-0
No files found.
app/assets/javascripts/set_status_modal/emoji_menu_in_modal.js
View file @
78029952
...
@@ -12,9 +12,8 @@ class EmojiMenuInModal extends AwardsHandler {
...
@@ -12,9 +12,8 @@ class EmojiMenuInModal extends AwardsHandler {
this
.
bindEvents
();
this
.
bindEvents
();
}
}
postEmoji
(
$emojiButton
,
awardUrl
,
selectedEmoji
,
callback
)
{
postEmoji
(
$emojiButton
,
awardUrl
,
selectedEmoji
)
{
this
.
selectEmojiCallback
(
selectedEmoji
,
this
.
emoji
.
glEmojiTag
(
selectedEmoji
));
this
.
selectEmojiCallback
(
selectedEmoji
,
this
.
emoji
.
glEmojiTag
(
selectedEmoji
));
callback
();
}
}
}
}
...
...
changelogs/unreleased/52888-status-emoji-should-not-be-added-to-awards-section-on-issue-page-2.yml
0 → 100644
View file @
78029952
---
title
:
Prevent awards emoji being updated when updating status
merge_request
:
23470
author
:
type
:
fixed
spec/features/profiles/user_edit_profile_spec.rb
View file @
78029952
...
@@ -147,6 +147,9 @@ describe 'User edit profile' do
...
@@ -147,6 +147,9 @@ describe 'User edit profile' do
end
end
context
'user menu'
do
context
'user menu'
do
let
(
:issue
)
{
create
(
:issue
,
project:
project
)}
let
(
:project
)
{
create
(
:project
)
}
def
open_user_status_modal
def
open_user_status_modal
find
(
'.header-user-dropdown-toggle'
).
click
find
(
'.header-user-dropdown-toggle'
).
click
...
@@ -205,6 +208,17 @@ describe 'User edit profile' do
...
@@ -205,6 +208,17 @@ describe 'User edit profile' do
end
end
end
end
it
'does not update the awards panel emoji'
do
project
.
add_maintainer
(
user
)
visit
(
project_issue_path
(
project
,
issue
))
emoji
=
'biohazard'
open_user_status_modal
select_emoji
(
emoji
,
true
)
expect
(
page
.
all
(
'.award-control .js-counter'
)).
to
all
(
have_content
(
'0'
))
end
it
'adds message to user status'
do
it
'adds message to user status'
do
message
=
'I have something to say'
message
=
'I have something to say'
open_user_status_modal
open_user_status_modal
...
...
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