diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-07 02:34:48 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-03-07 02:34:48 +0000 |
| commit | 0ec62b6c5d686496aa120edd66082af94007ca75 (patch) | |
| tree | fd50989710ca09928c902c933890349a7dc23987 /config | |
| parent | 55cc28d1ca167b502ef7a2f79b11e75fa559d174 (diff) | |
| parent | 5ea6f4b017ae5cecf431d26bbf69fea524fe9428 (diff) | |
| download | gitlab-ce-0ec62b6c5d686496aa120edd66082af94007ca75.tar.gz | |
Merge branch '26371-native-emojis-v3' into 'master'
Add emoji images - Base Native Unicode Emojis
Closes #26371
See merge request !9569
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 1 | ||||
| -rw-r--r-- | config/routes.rb | 3 | ||||
| -rw-r--r-- | config/routes/project.rb | 1 | ||||
| -rw-r--r-- | config/webpack.config.js | 1 |
4 files changed, 1 insertions, 5 deletions
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 3aba66111c3..7298e7109c6 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'), 'empty_states': path.join(ROOT_PATH, 'app/views/shared/empty_states'), 'icons': path.join(ROOT_PATH, 'app/views/shared/icons'), |