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/webpack.config.js | |
| 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/webpack.config.js')
| -rw-r--r-- | config/webpack.config.js | 1 |
1 files changed, 1 insertions, 0 deletions
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'), |