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

Backport #42583: Time#change should pass the zone property through if it's set #42612

Merged
merged 1 commit into from Jun 26, 2021

Conversation

pixeltrix
Copy link
Contributor

The ability to pass a zone object was only introduced in 2.6 but the respond_to? check for the utc_to_local method should ensure that branch doesn't get called so there's no need to conditionally define the method. However we do need to skip the additional tests on Ruby 2.5.

@pixeltrix pixeltrix merged commit 32097e3 into 6-1-stable Jun 26, 2021
@pixeltrix pixeltrix deleted the backport-42583 branch June 26, 2021 10:38

*Alex Ghiculescu*


Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Knit: ✂️ one too many \n

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We normally leave two line spaces between versions

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pixeltrix Ahh, good to know! I didn't realize the difference between stable branch changelogs, thank you for sharing!

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

Successfully merging this pull request may close these issues.

None yet

3 participants