Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump version to 0.10.6 #486

Merged
merged 3 commits into from
Oct 18, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/services/dependency-resolver.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import Ember from 'ember';
import config from '../config/environment';
import { task, timeout } from 'ember-concurrency';

const EMBER_VERSIONS = ['2.8.0', '2.7.3', '2.6.2', '2.5.1', '2.4.5', '2.3.2', '2.2.2', '2.1.2', '2.0.3', '1.13.13', '1.12.2'];
const EMBER_DATA_VERSIONS = ['2.8.0', '2.7.0', '2.6.2', '2.5.5', '2.4.3', '2.3.3', '2.2.1', '2.1.0', '2.0.1', '1.13.15'];
const EMBER_VERSIONS = ['2.9.0', '2.8.2', '2.7.3', '2.6.2', '2.5.1', '2.4.5', '2.3.2', '2.2.2', '2.1.2', '2.0.3', '1.13.13', '1.12.2'];
const EMBER_DATA_VERSIONS = ['2.9.0', '2.8.1', '2.7.0', '2.6.2', '2.5.5', '2.4.3', '2.3.3', '2.2.1', '2.1.0', '2.0.1', '1.13.15'];

const VERSION_REGEX = /^\d+.\d+.\d+(-beta\.\d+)?$/;

Expand Down
10 changes: 5 additions & 5 deletions blueprints/twiddle.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.10.5",
"version": "0.10.6",
"EmberENV": {
"FEATURES": {}
},
Expand All @@ -9,10 +9,10 @@
},
"dependencies": {
"jquery": "https://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.3/jquery.js",
"ember": "2.8.0",
"ember-data": "2.8.0",
"ember-template-compiler": "2.8.0",
"ember-testing": "2.8.0"
"ember": "2.9.0",
"ember-data": "2.9.0",
"ember-template-compiler": "2.9.0",
"ember-testing": "2.9.0"
},
"addons": {}
}
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-twiddle",
"version": "0.10.5",
"version": "0.10.6",
"dependencies": {
"ember": "2.8.0",
"ember-cli-shims": "0.1.1",
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-twiddle",
"version": "0.10.5",
"version": "0.10.6",
"description": "https://ember-twiddle.com",
"private": true,
"directories": {
Expand Down Expand Up @@ -43,15 +43,15 @@
"ember-cli-deploy-s3-pack": "~0.1.5",
"ember-cli-deploy-slack": "0.1.0",
"ember-cli-document-title": "0.3.1",
"ember-cli-fastboot": "1.0.0-beta.7",
"ember-cli-file-creator": "~0.3.0",
"ember-cli-fastboot": "1.0.0-beta.9",
"ember-cli-file-creator": "~0.4.0",
"ember-cli-htmlbars": "~1.0.3",
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
"ember-cli-inject-live-reload": "^1.4.0",
"ember-cli-jshint": "~1.0.0",
"ember-cli-jstree": "ritesh83/ember-cli-jstree#cda17d9e88911c5bbd245a498ba633571305347f",
"ember-cli-jstree": "~1.0.7",
"ember-cli-legacy-blueprints": "^0.1.0",
"ember-cli-mirage": "~0.2.1",
"ember-cli-mirage": "0.2.2",
"ember-cli-moment-shim": "~2.0.0",
"ember-cli-qunit": "~2.1.0",
"ember-cli-release": "1.0.0-beta.2",
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/columns-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import moduleForAcceptance from 'ember-twiddle/tests/helpers/module-for-acceptan

moduleForAcceptance('Acceptance | columns', {
beforeEach: function() {
server.create('user', 'octocat');
server.create('user', { login: 'octocat' });
}
});

Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/delete-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ moduleForAcceptance('Acceptance | delete gist', {
this.cacheConfirm = window.confirm;
window.confirm = () => true;

server.create('user', 'octocat');
server.create('user', { login: 'octocat' });
},

afterEach: function() {
Expand Down
11 changes: 6 additions & 5 deletions tests/acceptance/fork-test.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
import { test } from 'qunit';
import moduleForAcceptance from 'ember-twiddle/tests/helpers/module-for-acceptance';
import { stubValidSession } from 'ember-twiddle/tests/helpers/torii';
import { faker } from 'ember-cli-mirage';
import Mirage from 'ember-cli-mirage';

moduleForAcceptance('Acceptance | fork gist', {
beforeEach: function() {
this.cacheConfirm = window.confirm;
window.confirm = () => true;
this.cacheRandom = faker.random;
faker.seed(0.1);
server.create('user', { login: 'octocat' });

server.create('user', 'octocat');
server.post('/gists/:id/forks', () => {
let gist = server.create('gist', { id: 'bd9d8d69-a674-4e0f-867c-c8796ed151a0' });
return new Mirage.Response(200, {}, gist);
});
},

afterEach: function() {
window.confirm = this.cacheConfirm;
faker.random = this.cacheRandom;
}
});

Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/gist-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ moduleForAcceptance('Acceptance | gist', {
window.confirm = () => true;
window.prompt = () => promptValue;

server.create('user', 'octocat');
server.create('user', { login: 'octocat' });
},

afterEach: function() {
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/save-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ moduleForAcceptance('Acceptance | save gist', {
this.cacheConfirm = window.confirm;
window.confirm = () => true;

server.create('user', 'octocat');
server.create('user', { login: 'octocat' });
},

afterEach: function() {
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/twiddles-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const { K } = Ember;

moduleForAcceptance('Acceptance | twiddles', {
beforeEach: function() {
server.create('user', 'octocat');
server.create('user', { login: 'octocat' });
const owner = server.create('owner', {login: 'octocat'});
const file = server.create('gist-file', {
login: "octocat",
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/update-title-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import moduleForAcceptance from 'ember-twiddle/tests/helpers/module-for-acceptan

moduleForAcceptance('Acceptance | title input', {
beforeEach: function() {
server.create('user', 'octocat');
server.create('user', { login: 'octocat' });
}
});

Expand Down