From e1258f400261411caa24fb4e81c662a16f43da89 Mon Sep 17 00:00:00 2001
From: Hannah Wolfe <erisds@gmail.com>
Date: Tue, 31 Mar 2015 09:43:45 +0200
Subject: [PATCH] Fixing ember build

- removing --silent so we can see errors
- pinning dependencies
- the error with normalize is resolved by pinning ember-cli-sass to 3.1.0, and breaks if upgrading to 3.1.1 as a result of issues with libsass
---
 Gruntfile.js             | 2 +-
 core/client/bower.json   | 6 +++---
 core/client/package.json | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 9a4479277a..53ca3ad92b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -282,7 +282,7 @@ var _              = require('lodash'),
                                 return emberPath + ' build --environment=production --silent';
 
                             case 'dev':
-                                return emberPath + ' build --silent';
+                                return emberPath + ' build';
 
                             case 'test':
                                 return emberPath + ' test --silent';
diff --git a/core/client/bower.json b/core/client/bower.json
index 15e86d4226..66bb29b455 100644
--- a/core/client/bower.json
+++ b/core/client/bower.json
@@ -11,7 +11,7 @@
     "fastclick": "1.0.0",
     "google-caja": "5669.0.0",
     "ic-ajax": "1.0.1",
-    "jquery": "~1.11.2",
+    "jquery": "1.11.2",
     "jquery-file-upload": "9.5.6",
     "jquery-hammerjs": "1.0.1",
     "jquery-ui": "1.10.4",
@@ -20,7 +20,7 @@
     "loader.js": "ember-cli/loader.js#3.2.0",
     "moment": "2.8.3",
     "nanoscroller": "0.8.4",
-    "normalize-scss": "~3.0.1",
+    "normalize-scss": "3.0.2",
     "nprogress": "0.1.2",
     "rangyinputs": "1.2.0",
     "showdown-ghost": "0.3.6",
@@ -29,6 +29,6 @@
   "devDependencies": {
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.1",
-    "ember-mocha": "~0.4.2"
+    "ember-mocha": "0.4.4"
   }
 }
diff --git a/core/client/package.json b/core/client/package.json
index af6f27029e..ada207274e 100644
--- a/core/client/package.json
+++ b/core/client/package.json
@@ -30,7 +30,7 @@
     "ember-cli-ic-ajax": "0.1.1",
     "ember-cli-inject-live-reload": "^1.3.0",
     "ember-cli-mocha": "^0.4.2",
-    "ember-cli-sass": "^3.0.6",
+    "ember-cli-sass": "3.1.0",
     "ember-cli-uglify": "1.0.1",
     "ember-data": "^1.0.0-beta.14.1",
     "ember-export-application-global": "^1.0.2",