Merge branch 'move-concatenate-module-plugin' into 'master'

Disable webpack scope hoisting in development

See merge request gitlab-org/gitlab-ce!17942

config/webpack.config.js

@@ -222,9 +222,6 @@ const config = {
       names: ['main', 'common', 'webpack_runtime'],
     }),
-    // enable scope hoisting
-    new webpack.optimize.ModuleConcatenationPlugin(),
-
     // copy pre-compiled vendor libraries verbatim
     new CopyWebpackPlugin([
       {
@@ -281,6 +278,7 @@ if (IS_PRODUCTION) {
       minimize: true,
       debug: false,
     }),
+    new webpack.optimize.ModuleConcatenationPlugin(),
     new webpack.optimize.UglifyJsPlugin({
       sourceMap: true,
     }),