summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-03-30 18:23:13 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-03-30 18:23:13 +0000
commitfa9d140f00d4f3d52e08acb595ec62cd4a1e1caf (patch)
treebf9bd6fee884464276341957b819fe3b660817fc /app/controllers
parent673bb9ef1e9ca7c6a2fdd16bb75289181e076b08 (diff)
parent5830d80b8d2b87daa9123dc248ae00e2ed90069c (diff)
downloadgitlab-ce-fa9d140f00d4f3d52e08acb595ec62cd4a1e1caf.tar.gz
Merge branch 'precompile-emoji-urls' into 'master'
Pre-calculate Emoji digests cc @dzaporozhets @rspeicher @marin Do you happen to know if we allow users to configure asset hosts anywhere in Omnibus and such? I've not been able to find any reference to "asset_host" so it seems we don't allow this (which is a good thing as this simplifies the code). See merge request !3458
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/projects_controller.rb13
1 files changed, 1 insertions, 12 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 928817ba811..62f53664db3 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -138,7 +138,7 @@ class ProjectsController < Projects::ApplicationController
participants = ::Projects::ParticipantsService.new(@project, current_user).execute(note_type, note_id)
@suggestions = {
- emojis: autocomplete_emojis,
+ emojis: AwardEmoji.urls,
issues: autocomplete.issues,
mergerequests: autocomplete.merge_requests,
members: participants
@@ -235,17 +235,6 @@ class ProjectsController < Projects::ApplicationController
)
end
- def autocomplete_emojis
- Rails.cache.fetch("autocomplete-emoji-#{Gemojione::VERSION}") do
- Emoji.emojis.map do |name, emoji|
- {
- name: name,
- path: view_context.image_url("#{emoji["unicode"]}.png")
- }
- end
- end
- end
-
def repo_exists?
project.repository_exists? && !project.empty_repo?
end