diff options
author | Marin Jankovski <marin@gitlab.com> | 2014-03-24 17:22:11 +0400 |
---|---|---|
committer | Marin Jankovski <marin@gitlab.com> | 2014-03-24 17:22:11 +0400 |
commit | 5e985a7eed7317d4f0ed323c4f6f7d0f386fbde4 (patch) | |
tree | 1de5e52b58a6b012d5cca8567aa8ffd2436dd126 /app/controllers | |
parent | a87f03768f87c3ebe62b7aaf94380eb56239bd4e (diff) |
Use emoji assets on autocomplete.
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 8d24052f724..e181a0ec7fa 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -124,7 +124,7 @@ class ProjectsController < ApplicationController def autocomplete_sources @suggestions = { - emojis: Emoji.names, + emojis: Emoji.names.map { |e| { name: e, path: view_context.image_url("emoji/#{e}.png") } }, issues: @project.issues.select([:iid, :title, :description]), mergerequests: @project.merge_requests.select([:iid, :title, :description]), members: @project.team.members.sort_by(&:username).map { |user| { username: user.username, name: user.name } } |