Skip to content
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

Fix #1487 update test and docs to support erubi #1494

Merged
merged 4 commits into from Dec 8, 2018

Conversation

@tkmru
Copy link
Contributor

@tkmru tkmru commented Nov 5, 2018

I added docs, testing to support erubi. I can write only Japanese and English, so I updated only them. This is related to #1487 .

@tkmru tkmru changed the title Fix #1487 Support erubi Fix #1487 Chnage test and docs to support erubi Nov 5, 2018
@tkmru tkmru changed the title Fix #1487 Chnage test and docs to support erubi Fix #1487 update test and docs to support erubi Nov 5, 2018
Copy link
Member

@namusyaka namusyaka left a comment

LGTM with a few nits.

lib/sinatra/base.rb Outdated Show resolved Hide resolved
sinatra-contrib/spec/content_for_spec.rb Show resolved Hide resolved
@tkmru
Copy link
Contributor Author

@tkmru tkmru commented Nov 30, 2018

@namusyaka I fixed them.

@tkmru tkmru force-pushed the tkmru:support-erubi branch from 6d817fb to faa09fd Nov 30, 2018
Copy link
Member

@namusyaka namusyaka left a comment

Sorry for the delay, but looks good to me. Thanks for your contribution!

@namusyaka namusyaka merged commit 4607e1d into sinatra:master Dec 8, 2018
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
netbsd-srcmastr pushed a commit to NetBSD/pkgsrc that referenced this pull request Feb 6, 2019
## 2.0.5 / 2018-12-22

* Avoid FrozenError when params contains frozen value [#1506](sinatra/sinatra#1506) by Kunpei Sakai

* Add support for Erubi [#1494](sinatra/sinatra#1494) by @tkmru

* `IndifferentHash` monkeypatch warning improvements [#1477](sinatra/sinatra#1477) by Mike Pastore

* Improve development support and documentation and source code by Anusree Prakash, Jordan Owens, @ceclinux and @krororo.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants