Closed jjoos closed 11 years ago
Meh, github sometimes doesn't understand when two branches do the same thing :/ With local branches i just merge back master, to get proper difference, but that doesn't really work in this case. Sucky :/ I think with a regular difftool you will get proper differences. Maybe we could try to create a new branch from roqua, and then merge in develop? Though that probably will give lots of conflicts :/
@markijbema Better now?
To summarize this pull request, since @jjoos didn't provide one in the initial comment:
rails generate pavlov:query FindSprocket
)spec/
folder now mirrors the structure of the lib/
folder (this causes some long removed/added diffs for the spec files; since we both independently migrated to RSpec it doesn't know to see this as move rather than an rm+add)@marten Thanks for the summary, the purpose if this pull request wasn't merging it all back. But to get an overview of the changes.
I suggest we look at smaller pull requests to merge, certain things back. I also need to take a look at the validations, since we still need them. Would it be a problem if they stay?
No real problem, they mostly seemed to be deprecated, but not yet really. Since I had to convert the tests to RSpec, it seemed easier to delete them.
@markijbema I deleted all the entity smuck from Pavlov. Per your theory this diff should be better readible, no?