diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-03-06 23:23:14 +0000 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-03-06 23:23:14 +0000 |
| commit | 5ea6f4b017ae5cecf431d26bbf69fea524fe9428 (patch) | |
| tree | 5ebd7ca37674cf271e14b1a255bf3accef3973e4 /config/webpack.config.js | |
| parent | f911b948e9b376e65f5d5bf7e6d09b32e3c995c8 (diff) | |
| parent | ca132c7344dcc45992b00b25a4f141179a628b6a (diff) | |
| download | gitlab-ce-5ea6f4b017ae5cecf431d26bbf69fea524fe9428.tar.gz | |
Merge branch '26371-native-emojis-v3-code' into '26371-native-emojis-v3'
26371-native-emojis-v3
Native Unicode Emojis
See merge request !9570
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 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'), |