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

1 0 x #15

Closed
wants to merge 3 commits into from
Closed

1 0 x #15

wants to merge 3 commits into from

Conversation

JDutil
Copy link

@JDutil JDutil commented Mar 25, 2012

Based on #11 but updated to reference Spree 1.0.x instead of 0.80.x.

This is much cleaner to merge than https://github.com/joshmcarthur/spree-import-products/pull/14/files

@joshmcarthur
Copy link
Owner

Hey @JDutil,

I'll try and find some time tonight to sit down and merge in this pull request, and the others referencing other versions of Spree. I'm keen to get master as little used as possible by instead referencing the correct branches in the Versionfile, so may merge this into a new 1.0.x branch (similar to on your fork).

Cheers!

@sbounmy
Copy link

sbounmy commented Mar 25, 2012

just saw this PR, maybe we get something with #16 @JDutil @joshmcarthur

@joshmcarthur
Copy link
Owner

Hey @sbounmy,

I'll take a look at #16 tonight as well - I'll probably go for some mixture of the two (#16 seems to have some weird merges from other repos?), but I like having testing support in there.

Sound good?

@sbounmy
Copy link

sbounmy commented Mar 25, 2012

hey @joshmcarthur

Thanks for taking time to review pull requests!

I've been quickly trough #16 and it really provided a spree 1.0.x support with some partial namespacing and so.
Tested with integration tests here #17 and manually is working pretty well so far.

I am open to other ways to make this gem spree 1.0.x compatible :)

joshmcarthur added a commit that referenced this pull request Mar 26, 2012
@JDutil
Copy link
Author

JDutil commented May 4, 2012

Closing since this was merged into a branch. IMO though it would be good to update master to be up to date with the 1-1-x branch to make contributions to keep up with spree edge simpler. Then create stable branches when master would no longer be compatible.

@JDutil JDutil closed this May 4, 2012
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