diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-02-19 08:11:02 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-02-19 08:11:02 +0000 |
commit | ad12f11f3ed81637b4d72ce9e494fdbd1f26b1bb (patch) | |
tree | 3097d416524866e13efc21bbb9e1c441cac0a9f9 /app/controllers | |
parent | cb0b7de48267abee85d39571ae55a0e988cc21eb (diff) | |
parent | 20fcc5d6f602354fe9d4c1c811496798a053f7ba (diff) | |
download | gitlab-ce-ad12f11f3ed81637b4d72ce9e494fdbd1f26b1bb.tar.gz |
Merge branch 'rs-emoji' into 'master'
Update Gemojione for new hotness :sparkles:
Before | After
------ | -----
![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png)
See merge request !2800
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/projects_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 14ca7426c2f..aea08ecce3e 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -236,7 +236,7 @@ class ProjectsController < ApplicationController Emoji.emojis.map do |name, emoji| { name: name, - path: view_context.image_url("emoji/#{emoji["unicode"]}.png") + path: view_context.image_url("#{emoji["unicode"]}.png") } end end |