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

[12] timespan check #6896

Merged
merged 3 commits into from
Oct 23, 2017
Merged

[12] timespan check #6896

merged 3 commits into from
Oct 23, 2017

Conversation

dartcafe
Copy link
Contributor

Backport of #6837. This change is needed for the polls app also in current releases.
Hope I did the backport request correctly.

@dartcafe
Fix future time spans
917e996 
Signed-off-by: dartcafe <github@dartcafe.de>
@dartcafe
Correction
58f900f 
Signed-off-by: dartcafe <github@dartcafe.de>
@codecov
Copy link

codecov bot commented Oct 22, 2017 •
edited
Loading

Codecov Report

Merging #6896 into stable12 will increase coverage by <.01%.
The diff coverage is 75%.

@@              Coverage Diff               @@
##             stable12    #6896      +/-   ##
==============================================
+ Coverage       53.75%   53.76%   +<.01%     
- Complexity      22566    22577      +11     
==============================================
  Files            1384     1384              
  Lines           86591    86623      +32     
  Branches         1329     1329              
==============================================
+ Hits            46549    46569      +20     
- Misses          40042    40054      +12
Impacted Files Coverage Δ Complexity Δ
lib/private/DateTimeFormatter.php 77.14% <75%> (-3.63%) 49 <0> (+9)
.../dav/lib/Connector/Sabre/ExceptionLoggerPlugin.php 78.94% <0%> (-13.91%) 6% <0%> (+2%)

This was referenced Oct 22, 2017
Merged
Closed
@MorrisJobke MorrisJobke added 3. to review Waiting for reviews and removed backport-request labels Oct 23, 2017
MorrisJobke
MorrisJobke approved these changes Oct 23, 2017
View reviewed changes
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

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

Looks good 👍

@MorrisJobke MorrisJobke mentioned this pull request Oct 23, 2017
Merged
@MorrisJobke
Provide tests for future timestamp formatting
9b41236 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobke
Copy link
Member

I added the unit tests from #6913 😉

@MorrisJobke MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Oct 23, 2017
@MorrisJobke MorrisJobke added this to the Nextcloud 12.0.4 milestone Oct 23, 2017
@MorrisJobke MorrisJobke merged commit aaad2ab into stable12 Oct 23, 2017
@MorrisJobke MorrisJobke deleted the 12-timespan-check branch October 23, 2017 14:45
@dartcafe dartcafe mentioned this pull request Nov 16, 2017
Closed
@MorrisJobke MorrisJobke mentioned this pull request Nov 20, 2017
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nickvergessen nickvergessen nickvergessen approved these changes

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@rullzer rullzer Awaiting requested review from rullzer

@blizzz blizzz Awaiting requested review from blizzz

@LukasReschke LukasReschke Awaiting requested review from LukasReschke

Assignees
No one assigned
Labels
4. to release Ready to be released and/or waiting for tests to finish
Projects
None yet
Milestone
Nextcloud 12.0.4
Development

Successfully merging this pull request may close these issues.
3 participants
@dartcafe @MorrisJobke @nickvergessen