diff options
author | Eric Eastwood <contact@ericeastwood.com> | 2017-03-07 15:25:27 -0600 |
---|---|---|
committer | Eric Eastwood <contact@ericeastwood.com> | 2017-03-08 11:27:14 -0600 |
commit | ee9930145fafdd3869ecf985f0b2295081ac3c7e (patch) | |
tree | f7cfa42b679d813922d5ba0504517b25d0e9f625 /config | |
parent | 935574edd407ebb2f8aeeee2584da9b07850e813 (diff) | |
download | gitlab-ce-ee9930145fafdd3869ecf985f0b2295081ac3c7e.tar.gz |
Update emojis to use harmony modules (import/export)update-native-unicode-emojis-with-harmony-modules
Diffstat (limited to 'config')
-rw-r--r-- | config/webpack.config.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 7298e7109c6..41d1e317560 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -132,8 +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'), + 'emojis': path.join(ROOT_PATH, 'fixtures/emojis'), 'empty_states': path.join(ROOT_PATH, 'app/views/shared/empty_states'), 'icons': path.join(ROOT_PATH, 'app/views/shared/icons'), 'vendor': path.join(ROOT_PATH, 'vendor/assets/javascripts'), |