From e6fc0207cb37666cdf606c03641f2afbb5646213 Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Mon, 27 Feb 2017 22:44:34 -0600
Subject: Use native unicode emojis

 - gl_emoji for falling back to image/css-sprite when the browser
   doesn't support an emoji
 - Markdown rendering (Banzai filter)
 - Autocomplete
 - Award emoji menu
    - Perceived perf
    - Immediate response because we now build client-side
 - Update `digests.json` generation in gemojione rake task to be more
   useful and  include `unicodeVersion`

MR: !9437

See issues

 - #26371
 - #27250
 - #22474
---
 config/application.rb    | 1 -
 config/routes.rb         | 3 ---
 config/routes/project.rb | 1 -
 config/webpack.config.js | 1 +
 4 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'config')

diff --git a/config/application.rb b/config/application.rb
index fce3d5bcd22..cdb93e50e66 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -91,7 +91,6 @@ module Gitlab
 
     # Enable the asset pipeline
     config.assets.enabled = true
-    config.assets.paths << Gemojione.images_path
     config.assets.paths << "vendor/assets/fonts"
     config.assets.precompile << "*.png"
     config.assets.precompile << "print.css"
diff --git a/config/routes.rb b/config/routes.rb
index 06d565df469..06293316937 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -27,9 +27,6 @@ Rails.application.routes.draw do
   get '/autocomplete/users/:id' => 'autocomplete#user'
   get '/autocomplete/projects' => 'autocomplete#projects'
 
-  # Emojis
-  resources :emojis, only: :index
-
   # Search
   get 'search' => 'search#show'
   get 'search/autocomplete' => 'search#autocomplete', as: :search_autocomplete
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 7dc7963ab88..f5cc99b6867 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -13,7 +13,6 @@ constraints(ProjectUrlConstrainer.new) do
 
       resources :autocomplete_sources, only: [] do
         collection do
-          get 'emojis'
           get 'members'
           get 'issues'
           get 'merge_requests'
diff --git a/config/webpack.config.js b/config/webpack.config.js
index d9fa70c29fb..a3f9a5212e8 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -132,6 +132,7 @@ var config = {
     extensions: ['.js', '.es6', '.js.es6'],
     alias: {
       '~':              path.join(ROOT_PATH, 'app/assets/javascripts'),
+      'emoji-map$':      path.join(ROOT_PATH, 'fixtures/emojis/digests.json'),
       'emoji-aliases$': path.join(ROOT_PATH, 'fixtures/emojis/aliases.json'),
       'icons':          path.join(ROOT_PATH, 'app/views/shared/icons'),
       'vendor':         path.join(ROOT_PATH, 'vendor/assets/javascripts'),
-- 
cgit v1.2.1