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

[Stable10] Fix cancel upload and hide 'uploading' message for files_drop shared folders #34097

Merged
merged 2 commits into from
Feb 7, 2019

Conversation

VicDeo
Copy link
Member

@VicDeo VicDeo commented Jan 9, 2019

Intended for 10.1.1 / Stable10 is locked /

Backport of #33937

Description

Fix not working cancel upload and hide 'Uploading' message after the upload is done.

Related Issue

Motivation and Context

How Has This Been Tested?

#33177 (comment)

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

@codecov
Copy link

codecov bot commented Jan 9, 2019

Codecov Report

Merging #34097 into stable10 will decrease coverage by <.01%.
The diff coverage is 14.28%.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #34097      +/-   ##
==============================================
- Coverage       63.48%   63.48%   -0.01%     
  Complexity      19109    19109              
==============================================
  Files            1264     1264              
  Lines           75147    75154       +7     
  Branches         1286     1286              
==============================================
+ Hits            47710    47711       +1     
- Misses          27061    27067       +6     
  Partials          376      376
Flag Coverage Δ Complexity Δ
#javascript 53.28% <14.28%> (-0.04%) 0 <0> (ø)
#phpunit 64.57% <ø> (ø) 19109 <ø> (ø) ⬇️
Impacted Files Coverage Δ Complexity Δ
apps/files_sharing/js/PublicUploadView.js 67.39% <14.28%> (-9.54%) 0 <0> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b1465b0...b06ecdd. Read the comment docs.

1 similar comment
@codecov
Copy link

codecov bot commented Jan 9, 2019

Codecov Report

Merging #34097 into stable10 will decrease coverage by <.01%.
The diff coverage is 14.28%.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #34097      +/-   ##
==============================================
- Coverage       63.48%   63.48%   -0.01%     
  Complexity      19109    19109              
==============================================
  Files            1264     1264              
  Lines           75147    75154       +7     
  Branches         1286     1286              
==============================================
+ Hits            47710    47711       +1     
- Misses          27061    27067       +6     
  Partials          376      376
Flag Coverage Δ Complexity Δ
#javascript 53.28% <14.28%> (-0.04%) 0 <0> (ø)
#phpunit 64.57% <ø> (ø) 19109 <ø> (ø) ⬇️
Impacted Files Coverage Δ Complexity Δ
apps/files_sharing/js/PublicUploadView.js 67.39% <14.28%> (-9.54%) 0 <0> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b1465b0...b06ecdd. Read the comment docs.

Copy link
Contributor

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

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

👍

@VicDeo VicDeo merged commit 92a7650 into stable10 Feb 7, 2019
@delete-merged-branch delete-merged-branch bot deleted the stable10-fix-33177 branch February 7, 2019 13:03
@PVince81 PVince81 modified the milestones: development, QA Apr 12, 2019
@lock lock bot locked as resolved and limited conversation to collaborators Apr 15, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants