Mini xml 4 #6446

Merged
merged 1 commit into from May 23, 2012

Conversation

Projects
None yet
4 participants
Contributor

acapilleri commented May 22, 2012

this pull request fixes #6328 and it was also discussed on #6436

Contributor

acapilleri commented May 22, 2012

@rafaelfranca . done

Member

steveklabnik commented May 22, 2012

This doesn't merge cleanly. Mind rebasing?

Owner

rafaelfranca commented May 22, 2012

And squash the commits.

Contributor

acapilleri commented May 22, 2012

@rafaelfranca done, thanks

@acapilleri it still does not merge cleanly, could you please rebase it from current master? Thanks.

Contributor

acapilleri commented May 23, 2012

excuse me, if could be trivial. I cherry-pick the single commit from the 3-2 branch to the master and the diff seems ok.
Also I tryed to do a pull request to my master and the merge has gone well. What's happened? Also I rebased from the master

Contributor

acapilleri commented May 23, 2012

@carlosantoniodasilva , done, I think now it could be merged well. Thanks

I don't know what happened, but github was telling me it was not possible to merge 😃.. thanks!

Contributor

acapilleri commented May 23, 2012

:)... thanks and i'm sorry for this troubles

@acapilleri acapilleri changed xml type datetime to dateTime, fixes #6328
XmlMini define the xml 'datatime', but according to
http://www.w3.org/TR/xmlschema-2/#dateTime could be better
change this to 'dateTime' with upper case letter 'T.
So 'DateTime' and 'Time' are redefined from 'datetime' to 'dateTime'

add the changing to the changelog
5646d65
Contributor

acapilleri commented May 23, 2012

...ok.. updated and rebased, thanks

@carlosantoniodasilva carlosantoniodasilva added a commit that referenced this pull request May 23, 2012

@carlosantoniodasilva carlosantoniodasilva Merge pull request #6446 from acapilleri/mini_xml_4
Change xml type datetime to dateTime
a6d0e37

@carlosantoniodasilva carlosantoniodasilva merged commit a6d0e37 into rails:master May 23, 2012

Great, merged, thanks! :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment