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

expand 'path is already shared' error message #23718

Merged
merged 1 commit into from
Mar 19, 2021

Conversation

icewind1991
Copy link
Member

Signed-off-by: Robin Appelman robin@icewind.nl

@icewind1991 icewind1991 added the 3. to review Waiting for reviews label Oct 27, 2020
@icewind1991 icewind1991 added this to the Nextcloud 21 milestone Oct 27, 2020
@MorrisJobke
Copy link
Member

Also CI fails due to the changed message.

@icewind1991 icewind1991 force-pushed the already-shared-error-message branch 2 times, most recently from a18de89 to b254385 Compare October 29, 2020 12:22
@nextcloud nextcloud deleted a comment from faily-bot bot Oct 29, 2020
@@ -563,9 +564,9 @@ protected function userCreateChecks(IShare $share) {
//Shares are not identical
}

// Identical share already existst
// Identical share already exist
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
// Identical share already exist
// Identical share already exists

This was referenced Dec 14, 2020
@rullzer rullzer modified the milestones: Nextcloud 21, Nextcloud 22 Dec 23, 2020
@MorrisJobke
Copy link
Member

Conflicts with #25533

use OC\HintException;
use OCP\IL10N;

class AlreadyShared extends HintException {
Copy link
Member

Choose a reason for hiding this comment

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

Let me drop this commit, as it was already implemented in #25533

@MorrisJobke MorrisJobke force-pushed the already-shared-error-message branch 2 times, most recently from 39f849a to 6213473 Compare March 15, 2021 14:34
Signed-off-by: Robin Appelman <robin@icewind.nl>
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.

I rebased it and used the changes from #25533 in here instead of reimplementing it 👍

@MorrisJobke
Copy link
Member

/backport to stable20

@MorrisJobke
Copy link
Member

/backport to stable21

@skjnldsv
Copy link
Member

Noooooooooo

@MorrisJobke
Copy link
Member

Noooooooooo

No? :D

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews enhancement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants