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

Cherry-pick for 1.1.1 attempt2 #134

Merged
merged 9 commits into from Feb 22, 2015

Conversation

Projects
None yet
9 participants
@kasbah
Contributor

kasbah commented Jan 23, 2015

Proposing this as an alternative to #133 as there were a lot less commits mentioning the word "fix" than I initially thought (got my git revision range wrong). So here they are cherry picked. Let's see how the CI likes it.

Happy to prune out any you don't like or add any as well, or go back to doing it more manually with #133.

@kasbah

This comment has been minimized.

Show comment
Hide comment
@kasbah

kasbah Jan 23, 2015

Contributor

Made some amendments after the CI build failed.

Contributor

kasbah commented Jan 23, 2015

Made some amendments after the CI build failed.

evancz pushed a commit that referenced this pull request Feb 22, 2015

@evancz evancz merged commit 2bfa6ab into elm:stable Feb 22, 2015

1 check passed

continuous-integration/travis-ci The Travis CI build passed
Details
@evancz

This comment has been minimized.

Show comment
Hide comment
@evancz

evancz Feb 22, 2015

Member

Sorry for the delay, this looks good to me! I'll push it to the public repo soon.

Member

evancz commented Feb 22, 2015

Sorry for the delay, this looks good to me! I'll push it to the public repo soon.

@@ -17,6 +17,7 @@ To learn about text fields, see the
import Signal
import Graphics.Element (Element)
import Native.Graphics.Input
import Text -- used internally

This comment has been minimized.

@mgold

mgold Feb 22, 2015

Contributor

Uh-uh - this should be Native.Text (with no comment). It will still fix the bug but isn't quite as nice on the source code level.

@mgold

mgold Feb 22, 2015

Contributor

Uh-uh - this should be Native.Text (with no comment). It will still fix the bug but isn't quite as nice on the source code level.

@kasbah

This comment has been minimized.

Show comment
Hide comment
@kasbah

kasbah Feb 22, 2015

Contributor

I should have kept this up-to-date and included 57981c2 as well. @evancz what would you say to me keeping a WIP PR for stable and you can merge it whenever you want to do a stable release?

The rule would be no API function name changes or additions whatsoever: only bug fixes.

Contributor

kasbah commented Feb 22, 2015

I should have kept this up-to-date and included 57981c2 as well. @evancz what would you say to me keeping a WIP PR for stable and you can merge it whenever you want to do a stable release?

The rule would be no API function name changes or additions whatsoever: only bug fixes.

@evancz

This comment has been minimized.

Show comment
Hide comment
@evancz

evancz Feb 22, 2015

Member

Let me see if I understand exactly. We have a PR to stable that just has patch changes. It can be merged in and released whenever. Is that the idea?

Does this have any implications for merging in all of master at some later date? Otherwise, this sounds great to me, and I'm happy to do 1.1.2 to get the other fixes in there.

Member

evancz commented Feb 22, 2015

Let me see if I understand exactly. We have a PR to stable that just has patch changes. It can be merged in and released whenever. Is that the idea?

Does this have any implications for merging in all of master at some later date? Otherwise, this sounds great to me, and I'm happy to do 1.1.2 to get the other fixes in there.

@kasbah kasbah deleted the kasbah:stable-attempt2 branch Feb 22, 2015

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