diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-08-07 11:43:18 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-08-07 11:43:18 +0100 |
| commit | fecb1a2f3c77205a72eeff1a3501629d2d1811d8 (patch) | |
| tree | db6fe0c250f3238b011fe47afca301e77e529a6c /config | |
| parent | 7065bb3ef31fe04bea39aa07d620552eaaa26aba (diff) | |
| parent | 03b816f3e845c9b25d3588336fc1616238465deb (diff) | |
| download | gitlab-ce-fecb1a2f3c77205a72eeff1a3501629d2d1811d8.tar.gz | |
Merge branch 'master' into issue-discussions-refactor
* master: (21 commits)
Fix issues with pdf-js dependencies
fix missing changelog entries for security release on 2017-01-23
Update top bar issues icon
Fix order of CI lint ace editor loading
Fix spec
Fix spec
Fix spec
Add changelog
fix
Add a spec for concurrent process
Add changelog
essential
add CHANGELOG.md for !13208
adjust user contribution calendar time formatting
fix rubocop violations 👮
fix mysql syntax for date INTERVAL arithmatic
add tests for proper timezone date grouping within ContributionsCalendar
adjust timezone for date grouping in contributions calendar
use timezone-aware Date.current instead of Date.today in ContributionsCalendar class
display system timezone underneath activity calendar
...
Diffstat (limited to 'config')
| -rw-r--r-- | config/webpack.config.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index e81ef2abddb..30900db62e7 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -111,9 +111,12 @@ var config = { options: { limit: 2048 }, }, { - test: /\.(worker\.js|pdf|bmpr)$/, + test: /\.(worker(\.min)?\.js|pdf|bmpr)$/, exclude: /node_modules/, loader: 'file-loader', + options: { + name: '[name].[hash].[ext]', + } }, { test: /locale\/\w+\/(.*)\.js$/, |