BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
9250953a
Commit
9250953a
authored
Jul 12, 2016
by
Jack Davison
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix duplicate "me" in award emoji tooltip
* Works by explicitly deleting out-of-date data attributes * No longer directly assigns to data-original-title
parent
6c1ed00a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
CHANGELOG
CHANGELOG
+1
-0
awards_handler.js
app/assets/javascripts/awards_handler.js
+6
-1
No files found.
CHANGELOG
View file @
9250953a
...
...
@@ -77,6 +77,7 @@ v 8.11.0 (unreleased)
- Load project invited groups and members eagerly in `ProjectTeam#fetch_members`
- Add pipeline events hook
- Award emoji tooltips containing more than 10 usernames are now truncated !4780 (jlogandavison)
- Fix duplicate "me" in award emoji tooltip !5218 (jlogandavison)
- Bump gitlab_git to speedup DiffCollection iterations
- Rewrite description of a blocked user in admin settings. (Elias Werberich)
- Make branches sortable without push permission !5462 (winniehell)
...
...
app/assets/javascripts/awards_handler.js
View file @
9250953a
...
...
@@ -220,7 +220,12 @@
originalTitle
=
this
.
getAwardTooltip
(
awardBlock
);
authors
=
originalTitle
.
split
(
FROM_SENTENCE_REGEX
);
authors
.
splice
(
authors
.
indexOf
(
'You'
),
1
);
awardBlock
.
closest
(
'.js-emoji-btn'
).
removeData
(
'original-title'
).
attr
(
'data-original-title'
,
this
.
toSentence
(
authors
));
awardBlock
.
closest
(
'.js-emoji-btn'
)
.
removeData
(
'title'
)
.
removeAttr
(
'data-title'
)
.
removeAttr
(
'data-original-title'
)
.
attr
(
'title'
,
this
.
toSentence
(
authors
));
return
this
.
resetTooltip
(
awardBlock
);
};
...
...
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