diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-08-07 09:13:10 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-08-07 09:13:10 +0000 |
| commit | 727b6d16e5e11933c0879cfa9ed5eb3bb9280cf1 (patch) | |
| tree | 16649f5e4d23fb0a0d5f0b28cb25890d7999f493 /config | |
| parent | 4b34720c0ca8b5459cc56a4e52e11e213ab6ae9a (diff) | |
| parent | 440dc934dec31b4ef3ee78e5ae366f832719b173 (diff) | |
| download | gitlab-ce-727b6d16e5e11933c0879cfa9ed5eb3bb9280cf1.tar.gz | |
Merge branch 'master' into 'bvl-nfs-circuitbreaker'
# Conflicts:
# app/models/repository.rb
# spec/models/repository_spec.rb
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 4 | ||||
| -rw-r--r-- | config/webpack.config.js | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/config/application.rb b/config/application.rb index 1c13cc81270..f7145566262 100644 --- a/config/application.rb +++ b/config/application.rb @@ -23,13 +23,13 @@ module Gitlab # https://github.com/rails/rails/blob/v4.2.6/railties/lib/rails/engine.rb#L687 # This is a nice reference article on autoloading/eager loading: # http://blog.arkency.com/2014/11/dont-forget-about-eager-load-when-extending-autoload - config.eager_load_paths.push(*%W(#{config.root}/lib + config.eager_load_paths.push(*%W[#{config.root}/lib #{config.root}/app/models/hooks #{config.root}/app/models/members #{config.root}/app/models/project_services #{config.root}/app/workers/concerns #{config.root}/app/services/concerns - #{config.root}/app/finders/concerns)) + #{config.root}/app/finders/concerns]) config.generators.templates.push("#{config.root}/generator_templates") diff --git a/config/webpack.config.js b/config/webpack.config.js index 8b0c64f9289..1205b90de40 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -110,9 +110,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$/, |