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
182cc843
Commit
182cc843
authored
Jan 15, 2016
by
Zeger-Jan van de Weg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove leading comma when user is the only one to award that emoji
Fixes #9073
parent
a6e073fa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
+10
-4
CHANGELOG
CHANGELOG
+1
-0
app/assets/javascripts/awards_handler.coffee
app/assets/javascripts/awards_handler.coffee
+9
-4
No files found.
CHANGELOG
View file @
182cc843
...
@@ -58,6 +58,7 @@ v 8.4.0 (unreleased)
...
@@ -58,6 +58,7 @@ v 8.4.0 (unreleased)
- Import GitHub wiki into GitLab
- Import GitHub wiki into GitLab
- Add reporters ability to download and browse build artifacts (Andrew Johnson)
- Add reporters ability to download and browse build artifacts (Andrew Johnson)
- Autofill referring url in message box when reporting user abuse. (Josh Frye)
- Autofill referring url in message box when reporting user abuse. (Josh Frye)
- Remove leading comma on award emoji when the user is the first to award the emoji (Zeger-Jan van de Weg)
v 8.3.4
v 8.3.4
- Use gitlab-workhorse 0.5.4 (fixes API routing bug)
- Use gitlab-workhorse 0.5.4 (fixes API routing bug)
...
...
app/assets/javascripts/awards_handler.coffee
View file @
182cc843
...
@@ -19,7 +19,7 @@ class @AwardsHandler
...
@@ -19,7 +19,7 @@ class @AwardsHandler
@
addAwardToEmojiBar
(
emoji
)
@
addAwardToEmojiBar
(
emoji
)
$
(
".emoji-menu"
).
hide
()
$
(
".emoji-menu"
).
hide
()
addAwardToEmojiBar
:
(
emoji
)
->
addAwardToEmojiBar
:
(
emoji
)
->
@
addEmojiToFrequentlyUsedList
(
emoji
)
@
addEmojiToFrequentlyUsedList
(
emoji
)
...
@@ -66,9 +66,14 @@ class @AwardsHandler
...
@@ -66,9 +66,14 @@ class @AwardsHandler
addMeToAuthorList
:
(
emoji
)
->
addMeToAuthorList
:
(
emoji
)
->
award_block
=
@
findEmojiIcon
(
emoji
).
parent
()
award_block
=
@
findEmojiIcon
(
emoji
).
parent
()
authors
=
award_block
.
attr
(
"data-original-title"
).
split
(
", "
)
authors
=
_
.
compact
(
award_block
.
attr
(
"data-original-title"
).
split
(
", "
)
)
authors
.
push
(
"me"
)
authors
.
push
(
"me"
)
award_block
.
attr
(
"title"
,
authors
.
join
(
", "
))
if
authors
.
length
==
1
award_block
.
attr
(
"title"
,
"me"
)
else
award_block
.
attr
(
"title"
,
authors
.
join
(
", "
))
@
resetTooltip
(
award_block
)
@
resetTooltip
(
award_block
)
resetTooltip
:
(
award
)
->
resetTooltip
:
(
award
)
->
...
@@ -78,7 +83,7 @@ class @AwardsHandler
...
@@ -78,7 +83,7 @@ class @AwardsHandler
setTimeout
(
->
setTimeout
(
->
award
.
tooltip
()
award
.
tooltip
()
),
200
),
200
createEmoji
:
(
emoji
)
->
createEmoji
:
(
emoji
)
->
emojiCssClass
=
@
resolveNameToCssClass
(
emoji
)
emojiCssClass
=
@
resolveNameToCssClass
(
emoji
)
...
...
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