From 611019d71859dcfb045a8d1f63e9a817d7350bfe Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Thu, 8 Jul 2021 14:25:57 +0200
Subject: [PATCH] Merge pull request #4297 from
 overleaf/jpa-prepare-separate-defaults-per-env

[config] prepare separate overrides per env

GitOrigin-RevId: fc000c023e7cc8383075c633c2882ab8e6b36c4b
---
 services/web/.gitignore                              | 2 ++
 services/web/test/acceptance/config/settings.test.js | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/services/web/.gitignore b/services/web/.gitignore
index b86e3cce72..f7bd24a97c 100644
--- a/services/web/.gitignore
+++ b/services/web/.gitignore
@@ -63,6 +63,8 @@ config/*.coffee
 config/*.js
 !config/settings.defaults.js
 !config/settings.webpack.js
+!config/settings.overrides.saas.js
+!config/settings.overrides.server-pro.js
 
 modules/**/Makefile
 
diff --git a/services/web/test/acceptance/config/settings.test.js b/services/web/test/acceptance/config/settings.test.js
index c709a0da80..d83571d633 100644
--- a/services/web/test/acceptance/config/settings.test.js
+++ b/services/web/test/acceptance/config/settings.test.js
@@ -1,3 +1,5 @@
+const base = require('../../../config/settings.overrides.saas')
+
 let features
 const v1Api = {
   url: 'http://localhost:5000',
@@ -10,7 +12,7 @@ const httpAuthPass = 'password'
 const httpAuthUsers = {}
 httpAuthUsers[httpAuthUser] = httpAuthPass
 
-module.exports = {
+module.exports = base.mergeWith({
   cacheStaticAssets: true,
   enableSubscriptions: true,
 
@@ -234,4 +236,4 @@ module.exports = {
   test: {
     counterInit: 0,
   },
-}
+})