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

WIP: Merge diverging development #47

Closed
wants to merge 13 commits into from
Closed

Conversation

albus522
Copy link
Member

This is kind of a dual purpose pull request.

First: I would like to keep all development in 1 branch until we really need the code to drastically change based on AR versions. I was able to keep things compatible with 1 parse time AR version check.

Second: I have added AR versions to the build matrix to yell at us when we break compatibility. I am pretty sure the matrix is going to have a few incompatible combinations that I still need to sort out, but this is a start. Also currently, or prior to #46, 3.0 and 3.1 compatibility is/was broken. If we decide diverging development is where we need to go #46 will need to also be ported to 0-4-stable.

@sferik thoughts/comments?

@sferik
Copy link
Collaborator

sferik commented Apr 1, 2013

I am in complete agreement that we should not break compatibility with earlier Active Record versions unless and until we must (i.e. it's impossible to be compatible with both using the same code). I apologize for breaking this and would like to restore it. Thanks for your work on this.

@albus522
Copy link
Member Author

albus522 commented Apr 1, 2013

I am currently working on getting the test suite green on Travis. Currently having some issues with jruby on Travis. Everything passes locally, but there is something odd with the load path order on Travis. Technically we are safe to merge now, but I would really like to sort out Travis first.

@sferik
Copy link
Collaborator

sferik commented Apr 1, 2013

Once you’re done tweaking the Travis settings and tests are green, please squash the tweak commits.

Also, please take a look at this comment: 2611574#commitcomment-2920179

@coveralls
Copy link

Coverage increased (+8.6%) when pulling c4c904f on merge-diverging-development into 2611574 on master.

View Details

@albus522 albus522 mentioned this pull request Apr 1, 2013
@albus522 albus522 closed this Apr 1, 2013
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.

None yet

3 participants