gitlab-org--gitlab-foss/spec
Rémy Coutable 65352b5baa 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
2016-07-18 07:35:30 +00:00
..
config Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
controllers Cache todos pending/done dashboard query counts 2016-07-12 18:57:52 +02:00
factories Add approval required todos 2016-07-12 19:01:09 +01:00
features Revert "Merge branch 'gl-dropdown-issuable-form' into 'master'" 2016-07-15 23:46:29 +00:00
finders Avoid `describe`-ing symbols in specs 2016-07-12 10:27:58 -05:00
fixtures don't expect " encoding anymore 2016-07-14 10:08:16 -07:00
helpers use %(...) and %[...] in favor of %<...> 2016-07-14 22:43:49 -07:00
initializers Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
javascripts Merge branch '17341-firefox-u2f' into 'master' 2016-07-15 20:07:51 +00:00
lib Don't fail to highlight when Rouge doesn't have a lexer 2016-07-15 20:22:35 -05:00
mailers Represent DiffRefs as proper class instead of tuple array 2016-07-06 18:50:58 -04:00
models Update tests 2016-07-15 18:17:15 -05:00
requests Merge branch 'normalize_emoji_aliases_paths' into 'master' 2016-07-18 07:35:30 +00:00
routing Fix failing tests. 2016-07-11 16:11:33 -06:00
services Merge branch 'kradydal/gitlab-ce-create-todos-when-issue-author-assigne-or-mention-himself' 2016-07-15 15:03:04 -05:00
support Merge branch '17341-firefox-u2f' into 'master' 2016-07-15 20:07:51 +00:00
tasks/gitlab Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
views Do not show build retry link when build is active 2016-06-30 11:06:19 +02:00
workers Refresh branch cache after `git gc` 2016-07-13 06:49:58 -07:00
factories_spec.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
rails_helper.rb
spec_helper.rb We're not using them (and look at the typo) 2016-07-12 22:17:00 +08:00
teaspoon_env.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00