diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-09 17:39:26 +0000 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2017-03-10 13:11:35 -0800 |
| commit | 0383b9952b3836881e826ffa1504c8243e4d9f6b (patch) | |
| tree | b0be3d414e5cb2697bf0b7cc12395e8dcde1948e /config | |
| parent | fdb1a15f094d5098c204ccf4e4a81413705e90cf (diff) | |
| download | gitlab-ce-0383b9952b3836881e826ffa1504c8243e4d9f6b.tar.gz | |
Merge branch 'update-native-unicode-emojis-with-harmony-modules' into 'master'
Update emojis to use harmony modules (import/export)
See merge request !9784
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'), |