Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.

Update CM SHA to cherrypicks for release 38#7401

Merged
RaymondLim merged 1 commit intomasterfrom
nj/cm-release-38-cherrypicks
Apr 3, 2014
Merged

Update CM SHA to cherrypicks for release 38#7401
RaymondLim merged 1 commit intomasterfrom
nj/cm-release-38-cherrypicks

Conversation

@njx
Copy link
Copy Markdown

@njx njx commented Apr 3, 2014

This points the CM SHA to a temporary release-38-cherrypicks branch in the adobe/CodeMirror2 fork. It's essentially the CM 4.0 release plus two cherrypicked commits:

@njx
Copy link
Copy Markdown
Author

njx commented Apr 3, 2014

I did some brief manual testing with these cherrypicks and didn't see anything, and the unit tests all pass.

@RaymondLim - would you mind checking this for me to make sure it fixes the addressed bugs, and maybe doing a little bit of sanity testing around inline editors and general CM behavior? The main thing the fix should affect is the height of the document (in both full editors and inline editors), so be on the lookout for issues with the vertical size of the document (e.g. not being able to scroll all the way to the bottom, adding lines to the full editor or an inline editor causing strange behavior, inline editors not resizing to show all content, etc.).

@RaymondLim RaymondLim self-assigned this Apr 3, 2014
@RaymondLim
Copy link
Copy Markdown
Contributor

Looks good. Both issues are fixed and I can't find any new issue. Merging.

RaymondLim added a commit that referenced this pull request Apr 3, 2014
Update CM SHA to cherrypicks for release 38
@RaymondLim RaymondLim merged commit 1e8ec31 into master Apr 3, 2014
@RaymondLim RaymondLim deleted the nj/cm-release-38-cherrypicks branch April 3, 2014 23:20
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants