diff options
author | Rémy Coutable <remy@rymai.me> | 2016-07-18 10:35:30 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-07-18 10:35:30 +0300 |
commit | 65352b5baaf269a609b024fd13efc81e8bbdcefa (patch) | |
tree | d311bae9c90a704f2427aadf442ac4c69407e731 /app/services | |
parent | 1bf57b75119deb79f5826245d4c69a0a83cc4864 (diff) | |
parent | e21492b810bf9cd30f0e60836c056a72e830f427 (diff) |
Merge branch 'normalize_emoji_aliases_paths' into 'master'
Fix not normalized emoji paths
## What does this MR do?
It normalizes emoji names in `api` and `toggle_award`
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
User was able to store +1 and thumbsup to databse, causing UI inconsistency.
## What are the relevant issue numbers?
Fixes #19104
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [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)
- [x] API support added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5060
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/notes/create_service.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb index 02fca5c0ea3..18971bd0be3 100644 --- a/app/services/notes/create_service.rb +++ b/app/services/notes/create_service.rb @@ -8,7 +8,6 @@ module Notes if note.award_emoji? noteable = note.noteable todo_service.new_award_emoji(noteable, current_user) - return noteable.create_award_emoji(note.award_emoji_name, current_user) end |