Skip to content

Commit

Permalink
added coffeescript and moved admin require to bottom of file
Browse files Browse the repository at this point in the history
  • Loading branch information
Henry Oswald committed Oct 19, 2016
1 parent 6fe58b7 commit 8505907
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
6 changes: 5 additions & 1 deletion Gruntfile.coffee
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
coffee = require("coffee-script")
fs = require "fs"
spawn = require("child_process").spawn
exec = require("child_process").exec
Expand All @@ -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 = {}
Expand Down Expand Up @@ -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)

2 changes: 1 addition & 1 deletion config/services.js
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 8505907

Please sign in to comment.