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

[11] timespan check #6897

Merged
merged 2 commits into from
Oct 23, 2017
Merged

[11] timespan check #6897

merged 2 commits into from
Oct 23, 2017

Conversation

dartcafe
Copy link
Contributor

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

Signed-off-by: dartcafe <github@dartcafe.de>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@codecov
Copy link

codecov bot commented Oct 23, 2017

Codecov Report

Merging #6897 into stable11 will decrease coverage by 0.05%.
The diff coverage is 100%.

@@              Coverage Diff               @@
##             stable11    #6897      +/-   ##
==============================================
- Coverage       57.54%   57.48%   -0.06%     
- Complexity      19499    19508       +9     
==============================================
  Files            1163     1220      +57     
  Lines           65984    72830    +6846     
  Branches            0     1239    +1239     
==============================================
+ Hits            37971    41868    +3897     
- Misses          28013    30962    +2949
Impacted Files Coverage Δ Complexity Δ
lib/private/DateTimeFormatter.php 85.26% <100%> (+3.44%) 49 <0> (+9) ⬆️
apps/files_trashbin/lib/Trashbin.php 73.93% <0%> (-0.26%) 129% <0%> (ø)
apps/comments/js/commentcollection.js 86.36% <0%> (ø) 0% <0%> (?)
core/js/sharedialogshareelistview.js 68.7% <0%> (ø) 0% <0%> (?)
apps/files_versions/js/versioncollection.js 100% <0%> (ø) 0% <0%> (?)
core/js/systemtags/systemtagscollection.js 93.33% <0%> (ø) 0% <0%> (?)
apps/files_external/js/app.js 15.9% <0%> (ø) 0% <0%> (?)
apps/files_external/js/mountsfilelist.js 87.27% <0%> (ø) 0% <0%> (?)
core/js/apps.js 54.54% <0%> (ø) 0% <0%> (?)
apps/files_sharing/js/app.js 77.1% <0%> (ø) 0% <0%> (?)
... and 50 more

@MorrisJobke
Copy link
Member

I added the unit tests from #6913 😉

@MorrisJobke MorrisJobke added 3. to review Waiting for reviews and removed backport-request labels Oct 23, 2017
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.

Code looks good 👍

@MorrisJobke MorrisJobke added this to the Nextcloud 11.0.6 milestone Oct 23, 2017
@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 merged commit f52f841 into stable11 Oct 23, 2017
@MorrisJobke MorrisJobke deleted the 11-timespan-check branch October 23, 2017 14:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants