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

Update Ember-CLI to 1.13.13 #6113

Merged
merged 1 commit into from Nov 30, 2015

Conversation

@acburdine
Copy link
Member

commented Nov 21, 2015

no issue

TODO:

  • update ember-cli
  • ic-ajax => ember-ajax (should be a separate PR)

@acburdine acburdine force-pushed the acburdine:ember-cli-1.13.12 branch 2 times, most recently Nov 21, 2015

@acburdine acburdine changed the title [WIP] Update Ember-CLI to 1.13.12 Update Ember-CLI to 1.13.12 Nov 21, 2015

@acburdine

This comment has been minimized.

Copy link
Member Author

commented Nov 21, 2015

@kevinansfield I looked into switching ic-ajax to ember-ajax, and I got a good ways into it, but it also involves a lot more changes than I think are in the scope of this PR. I can work on finishing up the switch and just submit another PR.

@kevinansfield

This comment has been minimized.

Copy link
Contributor

commented Nov 23, 2015

👍 Agreed, the ember-ajax switch can definitely be a separate PR.

Can you remove the crossdomain.xml and robots.txt files? They're not used at all when the admin app is served through the ghost process so it's probably confusing to keep them around.

@kevinansfield

This comment has been minimized.

Copy link
Contributor

commented Nov 23, 2015

Also, this will want bumping to 1.13.13 😉 I think it's only loader.js and ember-cli-sri version bumps.

@kevinansfield

View changes

core/client/bower.json Outdated
@@ -23,7 +23,7 @@
"jqueryui-touch-punch": "furf/jquery-ui-touch-punch",
"jquery.simulate.drag-sortable": "0.1.0",
"keymaster": "1.6.3",
"loader.js": "3.2.1",
"loader.js": "3.3.0",

This comment has been minimized.

Copy link
@kevinansfield

kevinansfield Nov 23, 2015

Contributor

Is there are particular reason we're not specifying this the same way as ember-cli? "loader.js": "ember-cli/loader.js#3.4.0", - there must be a reason why they're explicit about which loader.js to pull in.

@kevinansfield

View changes

core/client/bower.json Outdated
"ember-data": "1.13.13",
"ember-cli-shims": "0.0.6",
"ember-cli-test-loader": "0.2.1",
"ember-data": "1.13.15",

This comment has been minimized.

Copy link
@kevinansfield

kevinansfield Nov 23, 2015

Contributor

I think we should be making ember-data updates in a separate PR so that it's easier to track down any behaviour changes.

@acburdine acburdine force-pushed the acburdine:ember-cli-1.13.12 branch 2 times, most recently Nov 23, 2015

@acburdine acburdine changed the title Update Ember-CLI to 1.13.12 Update Ember-CLI to 1.13.13 Nov 23, 2015

@kevinansfield

This comment has been minimized.

Copy link
Contributor

commented Nov 30, 2015

Quick ping - would you mind rebasing this when you get a moment? Excited to get this merged and the resulting super fast rebuilds 😀

@acburdine acburdine force-pushed the acburdine:ember-cli-1.13.12 branch Nov 30, 2015

@acburdine acburdine force-pushed the acburdine:ember-cli-1.13.12 branch to 7cbe728 Nov 30, 2015

kevinansfield added a commit that referenced this pull request Nov 30, 2015

@kevinansfield kevinansfield merged commit c884e67 into TryGhost:master Nov 30, 2015

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@acburdine acburdine deleted the acburdine:ember-cli-1.13.12 branch Jan 18, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.