Jacob SchatzandRémy Coutable f79bb559e2 Merge branch 'award-emoji-retina' into 'master' ...

Award emoji supports retina displays

Based on discussion in !2800

There is now a retina spritesheet for emojis. It is 2mb, don't know how big an issue that is.

Before:

![Screen_Shot_2016-02-19_at_11.07.25](/uploads/ea412579bcaddfd13fce67bf583de61b/Screen_Shot_2016-02-19_at_11.07.25.png)

After:

![Screen_Shot_2016-02-19_at_11.07.36](/uploads/9d44c6278ba31987bad03dc1f46edd8b/Screen_Shot_2016-02-19_at_11.07.36.png)

Also updated the rake task to make the @2x spritesheet https://gitlab.com/snippets/15348

cc\ @rspeicher @vsizov 

See merge request !2891

2016-02-21 21:06:58 +01:00

..

assets

Merge branch 'award-emoji-retina' into 'master'

2016-02-21 21:06:58 +01:00

controllers

Merge branch 'visibletrap/gitlab-ce-label'

2016-02-21 21:04:31 +01:00

finders

Merge branch 'visibletrap/gitlab-ce-label'

2016-02-21 21:04:31 +01:00

helpers

Merge branch 'issue_3409' into 'master'

2016-02-19 19:55:19 +01:00

mailers

Fix broken link in CI build notification emails

2016-02-12 14:01:27 +01:00

models

Merge branch 'flush-cache-web-editor' into 'master'

2016-02-21 21:06:44 +01:00

services

Merge branch 'issue_3409' into 'master'

2016-02-19 19:55:19 +01:00

uploaders

Let the CI runner know about builds that this build depends on

2016-01-14 19:45:55 +01:00

validators

Re-add EmailValidator to avoid the repetition of format: { with: Devise.email_regexp }

2016-02-09 18:15:35 +01:00

views

Merge branch 'visibletrap/gitlab-ce-label'

2016-02-21 21:04:31 +01:00

workers

Merge branch 'fix/gitpushservice-complexity-issue' into 'master'

2016-02-18 17:11:47 +01:00