diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-02-22 21:15:40 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-02-22 21:15:40 -0500 |
| commit | 67948368aec144ff7e9997ce184cb4d111622f08 (patch) | |
| tree | c94e382fb1aca074b6ce503255564828cb387e36 /app/controllers/projects_controller.rb | |
| parent | 608012629cc90337aba6c5bd4b2b73b530091fb0 (diff) | |
| parent | 7c8099853621cc2a244bf6e0fd37a8b503d1ec5e (diff) | |
| download | gitlab-ce-sidebar-sizing-higher-viewport.tar.gz | |
Merge branch 'master' into sidebar-sizing-higher-viewportsidebar-sizing-higher-viewport
Diffstat (limited to 'app/controllers/projects_controller.rb')
| -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 |