diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-09 17:39:26 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-03-09 17:39:26 +0000 |
| commit | d163ac26c50eaa371f5e6afa9281837cd10d2cc9 (patch) | |
| tree | 72c56ad11c3e4816177d6df30f31e3f8b553417d /config | |
| parent | 92bb0d8fc2e9331574ae7d4f235a2e93cc72fa26 (diff) | |
| parent | ee9930145fafdd3869ecf985f0b2295081ac3c7e (diff) | |
| download | gitlab-ce-d163ac26c50eaa371f5e6afa9281837cd10d2cc9.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 ff5f1412261..8e2b11a4145 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -133,8 +133,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'), |