update to 1.12.2 #1
Conversation
it seems that some quote mark handling changed in the build system which makes normal diffs horrible, so this commit is identical to the previous commit except it contains the new quotation changes this is to provide a clean diff for the actual changes between 1.12.1 and 1.12.2
link-to fix Commit: blimmer/ember.js@ec43132 More info on link-to fix: emberjs/ember.js#11829 emberjs/ember.js#11825 1.12.2 is a security update. details: http://emberjs.com/blog/2016/01/14/security-releases-ember-1-11-4-1-12-2-1-13-12-2-0-3-2-1-2-2-2-1.html
|
Hey @craigteegarden - thank you very much for this. This was on our plate to get fixed today and we appreciate the help. I do have a question, though. The first commit message says: I think this is a typo and it was a rebuild of 1.12.1 (with no changes), then you applied the fix in the next commit. Am I understanding that correctly? If so, I'm wondering if we should just create a new branch entirely off of ember.js#1.12.2, then apply the link-to fix applied. What do you think? |
|
It isn't a typo -- the first commit is 1.12.1 + your fix (functionally equivalent to your original commit), the next commit is 1.12.2 + your fix. I noticed when re-building that there seems to be a slight change in the build tools, or some other part of the build process that changed resulting files (quotes went from double to single). This created a huge amount of diffs making really hard to tell what the changes were, so I built your original 1.12.1 + fix using the new build system (first commit), then build 1.12.2 with your fix (second commit). This was so I could see only the 1.12.2 changes in the second commit's diff. It was more for me to double check everything was building correctly... We can just squash them together if that would be better. |
|
Ah, thank you for the explanation @craigteegarden . It was honestly so long ago I did this that I forgot how it was done. Merging now! |
I grabbed the 1.12.2 security release and cherry-picked your link-to fix onto it, rebuilt it and here are the output files. Thanks for providing this fork!
The branch I built this with is here: https://github.com/craigteegarden/ember.js/tree/v1.12.2-link-to-patched
link-to fix Commit:
blimmer/ember.js@ec43132
More info on link-to fix:
emberjs/ember.js#11829
emberjs/ember.js#11825
1.12.2 is a security update. details:
http://emberjs.com/blog/2016/01/14/security-releases-ember-1-11-4-1-12-2-1-13-12-2-0-3-2-1-2-2-2-1.html