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

bare minimum update work for ember 2 #79

Merged
merged 1 commit into from Aug 26, 2015
Merged

bare minimum update work for ember 2 #79

merged 1 commit into from Aug 26, 2015

Conversation

ghost
Copy link

@ghost ghost commented Aug 20, 2015

No description provided.

@ghost
Copy link
Author

ghost commented Aug 20, 2015

Hey @hhff,

My suggestion is that this PR is merged first, then I'll rebase #69 in order to get it merged as well.

@ghost
Copy link
Author

ghost commented Aug 20, 2015

Or maybe #69 won't need additional rebasing, can't think of any conflicting changes right now.

@ghost
Copy link
Author

ghost commented Aug 20, 2015

Let's see...

@hhff
Copy link
Collaborator

hhff commented Aug 21, 2015

Looks good to me. Man i really gotta figure out how to make vim strip whitespace...

@mike-north - want to get your thoughts on the Ember Try stuff here. Also @kellyselden could u have a peeper

❤️ this is a big one! gonna be our first minor release....!

@hhff hhff mentioned this pull request Aug 21, 2015
name: 'ember-release-with-proper-ember-data',
dependencies: {
'ember': 'components/ember#release',
'ember-data': '2.0.0-beta.2'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ember data 2.0 is no longer in beta

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks! just fixed it 👍

@ghost
Copy link
Author

ghost commented Aug 21, 2015

Hey @kellyselden, can you explain why ember-data is needed as a npm package and bower component, both?

@ghost
Copy link
Author

ghost commented Aug 24, 2015

Hey @hhff, @kellyselden, @mike-north:

Is there still something to do here apart from squashing the commits?

@hhff
Copy link
Collaborator

hhff commented Aug 24, 2015

I'll defer to @mike-north on that, he's the resident ember-try expert

@hhff
Copy link
Collaborator

hhff commented Aug 26, 2015

friendliest of friendly pings @mike-north

@@ -15,15 +15,12 @@ env:
- EMBER_TRY_SCENARIO=ember-1.12
- EMBER_TRY_SCENARIO=ember-1.13
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-release-ember-data-1.13.1x
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary

matrix:
fast_finish: true
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there's no point in fast_finish if you have no allowed_failures

@mike-north
Copy link
Collaborator

👍 once fixes are made

@ghost
Copy link
Author

ghost commented Aug 26, 2015

Thanks @mike-north!

@hhff:

Should be ready to go now! :)

mike-north added a commit that referenced this pull request Aug 26, 2015
bare minimum update work for ember 2
@mike-north mike-north merged commit af7956f into adopted-ember-addons:master Aug 26, 2015
@hhff
Copy link
Collaborator

hhff commented Aug 27, 2015

YES! Nice one dudes!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants