From 55061e1993610cec65344576e32c99bfc78a5741 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Wed, 28 Jul 2021 11:19:35 +0000 Subject: [PATCH] drop unrelated changes after rebase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- .../owncloud/ocs/handlers/apps/sharing/shares/shares.go | 4 +--- tests/acceptance/expected-failures-on-S3NG-storage.md | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go index f2d835f8c42..491f8e388c6 100644 --- a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go +++ b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go @@ -571,9 +571,7 @@ func (h *Handler) listSharesWithMe(w http.ResponseWriter, r *http.Request) { if stateFilter == collaboration.ShareState_SHARE_STATE_ACCEPTED || stateFilter == ocsStateUnknown { // only log errors. They may happen but we can continue trying to at least list the shares lcRes, err := client.ListContainer(ctx, &provider.ListContainerRequest{ - Ref: &provider.Reference{ - Path: path.Join(h.homeNamespace, h.sharePrefix), - }, + Ref: &provider.Reference{Path: path.Join(h.homeNamespace, h.sharePrefix)}, }) if err != nil || lcRes.Status.Code != rpc.Code_CODE_OK { h.logProblems(lcRes.GetStatus(), err, "could not list container, continuing without share jail path info") diff --git a/tests/acceptance/expected-failures-on-S3NG-storage.md b/tests/acceptance/expected-failures-on-S3NG-storage.md index be74effee65..b84f331dc50 100644 --- a/tests/acceptance/expected-failures-on-S3NG-storage.md +++ b/tests/acceptance/expected-failures-on-S3NG-storage.md @@ -919,7 +919,6 @@ _ocs: api compatibility, return correct status code_ - [apiShareManagementBasicToShares/deleteShareFromShares.feature:213](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/deleteShareFromShares.feature#211) - [apiShareManagementBasicToShares/deleteShareFromShares.feature:214](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/deleteShareFromShares.feature#212) - ### User Management User and group management features