diff options
| author | Bryce Johnson <bryce@gitlab.com> | 2017-04-16 02:38:07 +0300 |
|---|---|---|
| committer | Bryce Johnson <bryce@gitlab.com> | 2017-05-18 23:37:48 +0300 |
| commit | 3c668fa04fd7e0a1d925e9666eb727ed3e83d145 (patch) | |
| tree | 556d553c9b8915eee0337527f6f8feae0217d3e9 /config/webpack.config.js | |
| parent | a3eabcc20c422db7032e31397c21dbc6ca3166de (diff) | |
Consolidate user avatar Vue logic
Diffstat (limited to 'config/webpack.config.js')
| -rw-r--r-- | config/webpack.config.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 0781017c89f..7bc225968de 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -90,9 +90,9 @@ var config = { loader: 'raw-loader', }, { - test: /\.gif$/, + test: /\.(gif|png)$/, loader: 'url-loader', - query: { mimetype: 'image/gif' }, + options: { limit: 2048 }, }, { test: /\.(worker\.js|pdf|bmpr)$/, @@ -190,6 +190,7 @@ var config = { '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'), + 'images': path.join(ROOT_PATH, 'app/assets/images'), 'vendor': path.join(ROOT_PATH, 'vendor/assets/javascripts'), 'vue$': 'vue/dist/vue.esm.js', } |