From 85059077ed27f0c710e900372b633702a5861799 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 19 Oct 2016 11:39:40 +0100 Subject: [PATCH] added coffeescript and moved admin require to bottom of file --- Gruntfile.coffee | 6 +++++- config/services.js | 2 +- package.json | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Gruntfile.coffee b/Gruntfile.coffee index 217e06d2f0..aca3b1cbbd 100644 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -1,3 +1,4 @@ +coffee = require("coffee-script") fs = require "fs" spawn = require("child_process").spawn exec = require("child_process").exec @@ -20,7 +21,6 @@ module.exports = (grunt) -> grunt.loadNpmTasks 'grunt-concurrent' grunt.loadNpmTasks "grunt-contrib-coffee" grunt.loadNpmTasks "grunt-shell" - require('load-grunt-config')(grunt) execute = {} @@ -240,3 +240,7 @@ module.exports = (grunt) -> throw new Error("Can not connect to redis") return callback(err) rclient.on 'error', errorHandler + + + require('load-grunt-config')(grunt) + diff --git a/config/services.js b/config/services.js index 2072964383..e324b129f3 100644 --- a/config/services.js +++ b/config/services.js @@ -3,7 +3,7 @@ module.exports = [{ name: "web", repo: "https://github.com/sharelatex/web-sharelatex.git", - version: "master" + version: "ha-docker" }, { name: "real-time", repo: "https://github.com/sharelatex/real-time-sharelatex.git", diff --git a/package.json b/package.json index 851b4d8af9..3d63f4c5fa 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "description": "An online collaborative LaTeX editor", "dependencies": { "async": "^0.9.0", + "coffee-script": "^1.11.1", "east": "0.5.1", "east-mongo": "^0.1.2", "grunt-shell": "^1.1.1",