From 9a232626cce2139b34a549b12149cbedfd59c59d Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Fri, 24 Apr 2015 10:25:48 +0200
Subject: [PATCH] Update Ember.js to 1.11.3

---
 .editorconfig                    |  1 +
 app/styles/app/modules/tabs.sass |  2 +-
 bower.json                       | 10 +++++-----
 package.json                     | 22 +++++++++++-----------
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 2fe4874a..47c54384 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -18,6 +18,7 @@ indent_style = space
 indent_size = 2
 
 [*.hbs]
+insert_final_newline = false
 indent_style = space
 indent_size = 2
 
diff --git a/app/styles/app/modules/tabs.sass b/app/styles/app/modules/tabs.sass
index c0a02746..2d90aa8d 100644
--- a/app/styles/app/modules/tabs.sass
+++ b/app/styles/app/modules/tabs.sass
@@ -34,7 +34,7 @@
 
   @media #{$medium-up}
     ul
-     @extend %inline-block
+      display: block
     li
       float: left
       padding-right: 2em
diff --git a/bower.json b/bower.json
index 0c4a1eec..75ea2846 100644
--- a/bower.json
+++ b/bower.json
@@ -3,14 +3,14 @@
   "dependencies": {
     "handlebars": "2.0.0",
     "jquery": "^1.11.1",
-    "ember": "1.11.0-beta.5",
-    "ember-data": "1.0.0-beta.16",
-    "ember-resolver": "~0.1.11",
+    "ember": "1.11.3",
+    "ember-data": "1.0.0-beta.16.1",
+    "ember-resolver": "~0.1.15",
     "loader.js": "ember-cli/loader.js#1.0.1",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.0",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2",
-    "ember-qunit": "0.2.5",
+    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
+    "ember-qunit": "0.3.1",
     "ember-qunit-notifications": "0.0.5",
     "qunit": "~1.17.1",
     "visibilityjs": "~1.2.1",
diff --git a/package.json b/package.json
index 9486245a..54f673a2 100644
--- a/package.json
+++ b/package.json
@@ -14,30 +14,30 @@
   },
   "repository": "",
   "engines": {
-    "node": "0.10.33"
+    "node": "0.12"
   },
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "^2.0.0",
-    "ember-cli": "0.2.0",
-    "ember-cli-app-version": "0.3.2",
-    "ember-cli-babel": "^4.0.0",
-    "ember-cli-content-security-policy": "0.3.0",
+    "ember-cli": "^0.2.3",
+    "broccoli-asset-rev": "^2.0.2",
+    "ember-cli-app-version": "0.3.3",
+    "ember-cli-babel": "5.0.0",
+    "ember-cli-content-security-policy": "0.4.0",
     "ember-cli-dependency-checker": "0.0.8",
     "ember-cli-htmlbars": "0.7.4",
     "ember-cli-ic-ajax": "0.1.1",
     "ember-cli-inject-live-reload": "^1.3.0",
-    "ember-cli-qunit": "0.3.9",
+    "ember-cli-qunit": "0.3.10",
     "ember-cli-uglify": "1.0.1",
-    "ember-data": "1.0.0-beta.16",
+    "ember-data": "1.0.0-beta.16.1",
     "ember-export-application-global": "^1.0.2",
-    "broccoli-sass": "0.3.3",
+    "broccoli-sass": "0.6.5",
     "ember-cli-autoprefixer": "^0.3.0",
     "ember-cli-coffeescript": "0.10.0",
-    "ember-cli-document-title": "0.0.1",
+    "ember-cli-document-title": "0.1.0",
     "ember-cli-inline-images": "^0.0.4",
     "ember-cli-pretender": "0.3.1",
-    "ember-cli-sauce": "^0.0.7"
+    "ember-cli-sauce": "^1.1.0"
   }
 }