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.

Sign up for GitHub

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

Jump to bottom

Date next year difference #3157

Merged
merged 2 commits into from
Jul 23, 2015
Merged

Date next year difference #3157

merged 2 commits into from
Jul 23, 2015
+41 −2

Conversation

eregon
Copy link
Member

@eregon eregon commented Jul 21, 2015

From #2867, with commits rebased to avoid too much conflicts.

Ranjeet Singh added 2 commits July 21, 2015 11:43
@eregon
[jruby#2867] modified Date#>> to take calendar reforms under consider…
3b83d09 
…ation

- added tests for next month with calendar reform
- uses solution provided in jruby#1769 comments
- also fixes issues jruby#1769
@eregon
Add specs for Date#{<<,prev_year,next_year} around calendar reforms.
d2a4cb2 
* See jruby#2867.
@eregon eregon mentioned this pull request Jul 21, 2015
Closed
@eregon
Copy link
Member Author

eregon commented Jul 21, 2015

@raeoks I just took your commits and organized them a bit differently.

eregon added a commit that referenced this pull request Jul 23, 2015
@eregon
Merge pull request #3157 from eregon/date_next_year_difference
45154e9 
Date next year difference
@eregon eregon merged commit 45154e9 into jruby:master Jul 23, 2015
@eregon eregon mentioned this pull request Jul 23, 2015
Closed
@enebo enebo modified the milestone: Non-Release May 25, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Non-Release
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@eregon @enebo