From 8a037844d531006271dab731f869151dc6b4cb85 Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Wed, 20 Nov 2019 18:05:24 +0100
Subject: [PATCH] Revert CircleCI and some webpack changes to match upstream

---
 .circleci/config.yml    | 6 +-----
 config/webpack/tests.js | 3 ---
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 796d6cf6e5..ff8eb48598 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,7 +9,6 @@ aliases:
           DB_HOST: localhost
           DB_USER: root
           RAILS_ENV: test
-          NODE_ENV: test
           PARALLEL_TEST_PROCESSORS: 4
           ALLOW_NOPAM: true
           CONTINUOUS_INTEGRATION: true
@@ -122,10 +121,7 @@ jobs:
     steps:
       - *attach_workspace
       - *install_system_dependencies
-      - run:
-          name: Precompile assets
-          command: ./bin/rails assets:precompile
-          no_output_timeout: 40m
+      - run: ./bin/rails assets:precompile
       - persist_to_workspace:
           root: ~/projects/
           paths:
diff --git a/config/webpack/tests.js b/config/webpack/tests.js
index f912445876..8b56eb92f2 100644
--- a/config/webpack/tests.js
+++ b/config/webpack/tests.js
@@ -5,7 +5,4 @@ const sharedConfig = require('./shared.js');
 
 module.exports = merge(sharedConfig, {
   mode: 'development',
-  optimization: {
-    minimize: false,
-  },
 });