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
454bb145
Commit
454bb145
authored
Sep 23, 2016
by
Luke Bennett
Committed by
Fatih Acet
Sep 27, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added `@zeiv`s changes to fix awards search, including CHANGELOG where he is credited
parent
6602b917
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
CHANGELOG
CHANGELOG
+1
-0
app/assets/javascripts/awards_handler.js
app/assets/javascripts/awards_handler.js
+1
-1
No files found.
CHANGELOG
View file @
454bb145
...
...
@@ -8,6 +8,7 @@ v 8.12.2 (unreleased)
v 8.12.1
- Fix a memory leak in HTML::Pipeline::SanitizationFilter::WHITELIST
- Fix issue with search filter labels not displaying
- Fix bug where 'Search results' repeated many times when a search in the emoji search form is cleared (Xavier Bick) (@zeiv)
v 8.12.0
- Update the rouge gem to 2.0.6, which adds highlighting support for JSX, Prometheus, and others. !6251
...
...
app/assets/javascripts/awards_handler.js
View file @
454bb145
...
...
@@ -357,7 +357,7 @@
$
(
'
ul.emoji-menu-search, h5.emoji-search
'
).
remove
();
if
(
term
)
{
// Generate a search result block
h5
=
$
(
'
<h5>
'
).
text
(
'
Search results
'
);
h5
=
$
(
'
<h5
class="emoji-search" /
>
'
).
text
(
'
Search results
'
);
found_emojis
=
_this
.
searchEmojis
(
term
).
show
();
ul
=
$
(
'
<ul>
'
).
addClass
(
'
emoji-menu-list emoji-menu-search
'
).
append
(
found_emojis
);
$
(
'
.emoji-menu-content ul, .emoji-menu-content h5
'
).
hide
();
...
...
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