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 bug in method AR TimeZoneConverter#set_time_zone_without_conversion #25834

Merged
merged 1 commit into from Jul 20, 2016

Conversation

Projects
None yet
5 participants
@alpaca-tc
Contributor

alpaca-tc commented Jul 14, 2016

Summary

Multi-parameter attributes conversion with invalid params doesn't work when time_zone_aware_attributes is enabled, because when invalid params is given to Multi-parameter attributes conversion, set_time_zone_without_conversion is assigned to nil.

@rails-bot

This comment has been minimized.

rails-bot commented Jul 14, 2016

Thanks for the pull request, and welcome! The Rails team is excited to review your changes, and you should hear from @sgrif (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@alpaca-tc alpaca-tc changed the title from Fix bug in in method AR TimeZoneConverter#set_time_zone_without_conversion to Fix bug in method AR TimeZoneConverter#set_time_zone_without_conversion Jul 14, 2016

@rafaelfranca

This comment has been minimized.

Member

rafaelfranca commented Jul 17, 2016

Could you add a CHANGELOG entry?

@alpaca-tc

This comment has been minimized.

Contributor

alpaca-tc commented Jul 17, 2016

@rafaelfranca

This comment has been minimized.

Member

rafaelfranca commented Jul 17, 2016

Could you squash your commits?

@alpaca-tc alpaca-tc force-pushed the alpaca-tc:fixes_multiparameter_attributes_on_time_with_time_zone_aware_attributes branch Jul 17, 2016

@alpaca-tc

This comment has been minimized.

Contributor

alpaca-tc commented Jul 17, 2016

@rafaelfranca i see 😄

@alpaca-tc alpaca-tc force-pushed the alpaca-tc:fixes_multiparameter_attributes_on_time_with_time_zone_aware_attributes branch Jul 17, 2016

@alpaca-tc

This comment has been minimized.

Contributor

alpaca-tc commented Jul 17, 2016

@alpaca-tc alpaca-tc force-pushed the alpaca-tc:fixes_multiparameter_attributes_on_time_with_time_zone_aware_attributes branch to 7805350 Jul 19, 2016

@rafaelfranca rafaelfranca merged commit e2b71e9 into rails:master Jul 20, 2016

2 checks passed

codeclimate Code Climate didn't find any new or fixed issues.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

rafaelfranca added a commit that referenced this pull request Jul 20, 2016

Merge pull request #25834 from alpaca-tc/fixes_multiparameter_attribu…
…tes_on_time_with_time_zone_aware_attributes

Fix bug in method AR TimeZoneConverter#set_time_zone_without_conversion

@alpaca-tc alpaca-tc deleted the alpaca-tc:fixes_multiparameter_attributes_on_time_with_time_zone_aware_attributes branch Jul 20, 2016

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