diff options
| author | Joshua Lambert <joshua@gitlab.com> | 2017-03-16 18:45:46 +0000 |
|---|---|---|
| committer | Joshua Lambert <joshua@gitlab.com> | 2017-03-16 18:45:46 +0000 |
| commit | d2f209a60b2ea2d889eaf5142c8d09ba0848a4c3 (patch) | |
| tree | 62810ea2d1f8aa1d131e31ad667c39ea0a6d466a /config/webpack.config.js | |
| parent | 83259875939958c6288066a3a4e59a5062b4c9e6 (diff) | |
| parent | ce5d1b6fd7ed1aea2d2a675414ba81be624f2bf1 (diff) | |
| download | gitlab-ce-29142-add-prometheus-integration-documentation.tar.gz | |
Merge branch 'master' into '29142-add-prometheus-integration-documentation'29142-add-prometheus-integration-documentation
# Conflicts:
# doc/install/requirements.md
Diffstat (limited to 'config/webpack.config.js')
| -rw-r--r-- | config/webpack.config.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 8e2b11a4145..cbcc9ac5aea 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -56,7 +56,7 @@ var config = { module: { rules: [ { - test: /\.(js|es6)$/, + test: /\.js$/, exclude: /(node_modules|vendor\/assets)/, loader: 'babel-loader', options: { @@ -130,7 +130,7 @@ var config = { ], resolve: { - extensions: ['.js', '.es6', '.js.es6'], + extensions: ['.js'], alias: { '~': path.join(ROOT_PATH, 'app/assets/javascripts'), 'emojis': path.join(ROOT_PATH, 'fixtures/emojis'), |