diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-03-07 04:57:34 +0300 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-03-07 04:57:34 +0300 |
| commit | 55cc28d1ca167b502ef7a2f79b11e75fa559d174 (patch) | |
| tree | 50c7a10972cddbeb5f3cc374669a91a465617812 | |
| parent | e1cc0fd564fd03a4ff3b01b0124420f8a02c1970 (diff) | |
| parent | 8a322f784e5cc2dd9603a1cc1ed9532a8cff45a2 (diff) | |
Merge branch 'backport-ee-change-webpack-empty-states' into 'master'
Backport change introduced in EE - alias for empty states SVGs
See merge request !9683
| -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..3aba66111c3 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -133,6 +133,7 @@ var config = { alias: { '~': path.join(ROOT_PATH, 'app/assets/javascripts'), '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'), 'vendor': path.join(ROOT_PATH, 'vendor/assets/javascripts'), 'vue$': 'vue/dist/vue.common.js', |