Merge pull request #17 from fuzzmz/ghost_v0.5.7

Upgrade to Ghost v0.5.7
fuzzmz · Dec 16, 2014 · 772406c · 772406c
2 parents bbbf914 + 2dc0356
commit 772406c
Show file tree

Hide file tree

Showing 391 changed files with 30,225 additions and 978 deletions.
diff --git a/.openshift/quickstart.json b/.openshift/quickstart.json
@@ -1,7 +1,7 @@
 {
 "name":"Ghost",
 "website":"http://tryghost.org/",
-"version":"0.5.6",
+"version":"0.5.7",
 "initial_git_url":"https://github.com/fuzzmz/openshift-ghost-quickstart.git",
 "cartridges":["nodejs-0.10"],
 "env_variables":[{"name":"value"},{"name":"value"}],

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -317,7 +317,7 @@ var _              = require('lodash'),
                 },
 
                 testem: {
-                    command: path.resolve(cwd + '/node_modules/.bin/testem ci'),
+                    command: path.resolve(cwd + '/node_modules/.bin/testem ci -f core/test/client/testem.json'),
                     options: {
                         stdout: true,
                         stdin: false

diff --git a/bower.json b/bower.json
@@ -8,7 +8,7 @@
     "ember-data": "1.0.0-beta.11",
     "ember-load-initializers": "git://github.com/stefanpenner/ember-load-initializers.git#0.0.1",
     "ember-resolver": "git://github.com/stefanpenner/ember-jj-abrams-resolver.git#181251821cf513bb58d3e192faa13245a816f75e",
-    "ember-simple-auth": "0.6.6",
+    "ember-simple-auth": "0.7.2",
     "fastclick": "1.0.0",
     "handlebars": "1.3.0",
     "ic-ajax": "1.0.1",