diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-09-26 22:02:33 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-09-26 22:02:33 +0000 |
| commit | f590e6f1147a9fff5df350df6bae5e33f84d33de (patch) | |
| tree | 0f8745eac7e7d2b4200111cbdef6e9423aa538e8 /app/helpers/lfs_helper.rb | |
| parent | 74d35075b9c5f051b631214b61b97107ac6fed2e (diff) | |
| parent | 454bb145f0a3e014e8e87637a8f40b7d4119eadf (diff) | |
| download | gitlab-ce-f590e6f1147a9fff5df350df6bae5e33f84d33de.tar.gz | |
Merge branch '22525-emoji-dropdown-shows-search-results-label-several-times' into 'master'
Fixed awards dropdown search text from repeating
## What does this MR do?
Thanks @zeiv for this!
>This fixes #20463 by adding the .emoji-search class to the "Search results" h5 element. AwardsHandler.prototype.setupSearch() was trying to remove the element before creating a new one, but wasn't because the it was attempting to select it with the .emoji-search class, which wasn't being added.
## Are there points in the code the reviewer needs to double check?
>I don't believe so.
## Why was this MR needed?
>See #20463
_(and #22525)_
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #22525
See merge request !6498
Diffstat (limited to 'app/helpers/lfs_helper.rb')
0 files changed, 0 insertions, 0 deletions