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

Fix moving files out of a shared folder #4329

Merged
merged 2 commits into from
Apr 12, 2017
Merged

Fix moving files out of a shared folder #4329

merged 2 commits into from
Apr 12, 2017

Conversation

icewind1991
Copy link
Member

Fixes #4327

@icewind1991
rename Jail::getSourcePath to getUnjailedPath to fix conflict with Lo…
2f949f4 
…cal::getSourcePath

Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
use unjailed path when moving files out of a shared storage
8500deb 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 icewind1991 added the 3. to review Waiting for reviews label Apr 12, 2017
@icewind1991 icewind1991 added this to the Nextcloud 12.0 milestone Apr 12, 2017
@icewind1991 icewind1991 mentioned this pull request Apr 12, 2017
Closed
rullzer
rullzer approved these changes Apr 12, 2017
View reviewed changes
Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

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

Fixes it!

@rullzer rullzer requested a review from MorrisJobke April 12, 2017 15:06
MorrisJobke
MorrisJobke approved these changes Apr 12, 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.

Tested and works 👍

@MorrisJobke
Copy link
Member

MorrisJobke commented Apr 12, 2017 •
edited
Loading

Let me restart the tests, that timed out:

  • TESTS=nodb-codecov
  • TESTS=integration-dav-v2
  • TESTS=integration-ocs-v1
  • TESTS=integration-sharing-v1-part2

@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 Apr 12, 2017
@MorrisJobke MorrisJobke mentioned this pull request Apr 12, 2017
Merged
@MorrisJobke MorrisJobke merged commit 31024b7 into master Apr 12, 2017
@MorrisJobke MorrisJobke deleted the move-out-shared-folder branch April 12, 2017 16:44
@MorrisJobke MorrisJobke mentioned this pull request Apr 12, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rullzer rullzer rullzer approved these changes

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@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
Development

Successfully merging this pull request may close these issues.
3 participants
@icewind1991 @MorrisJobke @rullzer