From a9ca54b98ae1bf9ea26165db6d03508eaa43fcf5 Mon Sep 17 00:00:00 2001
From: James Allen <james@sharelatex.com>
Date: Sat, 2 Dec 2017 13:02:37 +0000
Subject: [PATCH 1/2] Generate docker-compose.yml before any docker-compose
 command

---
 services/web/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/web/Makefile b/services/web/Makefile
index 44017629d1..98695a8c1f 100644
--- a/services/web/Makefile
+++ b/services/web/Makefile
@@ -30,11 +30,11 @@ clean:
 		rm -rf $$dir/test/unit/js; \
 		rm -rf $$dir/test/acceptance/js; \
 	done
-	# Deletes node_modules volume
-	docker-compose down --volumes
 	# Regenerate docker-shared.yml - not stictly a 'clean',
 	# but lets `make clean install` work nicely
 	bin/generate_volumes_file
+	# Deletes node_modules volume
+	docker-compose down --volumes
 
 # Need regenerating if you change the web modules you have installed
 docker-shared.yml:

From aaa908187d7088a151c35fb0968b6c079bcfb554 Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Sat, 2 Dec 2017 13:38:23 +0000
Subject: [PATCH 2/2] added layout.pug back in

---
 services/web/app/views/layout.pug | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/web/app/views/layout.pug b/services/web/app/views/layout.pug
index 822923ac08..31afc17d29 100644
--- a/services/web/app/views/layout.pug
+++ b/services/web/app/views/layout.pug
@@ -132,7 +132,8 @@ html(itemscope, itemtype='http://schema.org/Product')
 				// minimal requirejs configuration (can be extended/overridden)
 				window.requirejs = {
 					"paths" : {
-						"moment": "libs/#{lib('moment')}"
+						"moment": "libs/#{lib('moment')}",
+						"fineuploader": "libs/#{lib('fineuploader')}"
 					},
 					"urlArgs": "fingerprint=#{fingerprint(jsPath + 'main.js')}-#{fingerprint(jsPath + 'libs.js')}",
 					"config":{