From 391e2ad377d6143cfebfb43d85f9ae115de659d5 Mon Sep 17 00:00:00 2001 From: Eric Kelly Date: Sun, 9 Aug 2015 13:30:53 -0400 Subject: [PATCH] Bump ember-cli to v1.13.7 --- .travis.yml | 32 ++++++++++++++++---------------- app/templates/application.hbs | 4 ++-- package.json | 2 +- public/crossdomain.xml | 18 +++++++++--------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.travis.yml b/.travis.yml index c88b10cd..4080171f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,28 +1,28 @@ language: node_js node_js: -- '0.12' + - '0.12' notifications: email: false sudo: false cache: directories: - - node_modules + - node_modules before_install: -- npm config set spin false -- npm install -g npm@^2 + - npm config set spin false + - npm install -g npm@^2 install: -- mkdir travis-phantomjs -- wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 - -O $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -- tar -xvf $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -C $PWD/travis-phantomjs -- export PATH=$PWD/travis-phantomjs:$PATH -- npm install -g bower -- npm install -- bower install + - mkdir travis-phantomjs + - wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 + -O $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 + - tar -xvf $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -C $PWD/travis-phantomjs + - export PATH=$PWD/travis-phantomjs:$PATH + - npm install -g bower + - npm install + - bower install script: -- npm test -- scripts/travis-deploy.sh + - npm test + - scripts/travis-deploy.sh env: global: - - secure: Dwthqo6GaXQt7erj89xMa/2GRua9PTzcSKXYmxjE0O46DMuBR80JjPges0hGCWwPcdMFqsaMshSaTVF5eHc49vhaziB2sqWwLZndkRFIAsNGnBZkBpeZc9MsTNMbPP5KyJh/pG03nJLXUSz6xzMoxDNU/QHWyBYBxTlfxVGewLE= - - secure: H3EtrTdcXIDOjp59Mu/7KA7N2UrVgKjt2YVtW6dqby/Oa5q/jpfnomE70fhIpFTle6MavhAIujQ5awMRC/80EJXlZp5hnSd9DKyCpk70I1KoT6vm34RjZfSP9kAyRyokLwfjEkovCFltY3/i8y+8QFEVr8RkNt1VP2hY1ScFzys= + - secure: Dwthqo6GaXQt7erj89xMa/2GRua9PTzcSKXYmxjE0O46DMuBR80JjPges0hGCWwPcdMFqsaMshSaTVF5eHc49vhaziB2sqWwLZndkRFIAsNGnBZkBpeZc9MsTNMbPP5KyJh/pG03nJLXUSz6xzMoxDNU/QHWyBYBxTlfxVGewLE= + - secure: H3EtrTdcXIDOjp59Mu/7KA7N2UrVgKjt2YVtW6dqby/Oa5q/jpfnomE70fhIpFTle6MavhAIujQ5awMRC/80EJXlZp5hnSd9DKyCpk70I1KoT6vm34RjZfSP9kAyRyokLwfjEkovCFltY3/i8y+8QFEVr8RkNt1VP2hY1ScFzys= diff --git a/app/templates/application.hbs b/app/templates/application.hbs index 94df915c..f8bc38e7 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -1,3 +1,3 @@ -

Welcome to Ember.js

+

Welcome to Ember

-{{outlet}} \ No newline at end of file +{{outlet}} diff --git a/package.json b/package.json index 89e1d742..0be3c3a0 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "ember-api-actions": "0.0.7", "ember-autoresize": "0.5.1", "ember-browserify": "^1.0.1", - "ember-cli": "1.13.6", + "ember-cli": "1.13.7", "ember-cli-app-version": "0.4.0", "ember-cli-babel": "^5.0.0", "ember-cli-bootstrap-sassy": "0.0.18", diff --git a/public/crossdomain.xml b/public/crossdomain.xml index 29a035d7..0c16a7a0 100644 --- a/public/crossdomain.xml +++ b/public/crossdomain.xml @@ -1,15 +1,15 @@ - + - - + + - - + +