Skip to content

Commit

Permalink
drop unrelated changes after rebase
Browse files Browse the repository at this point in the history
Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
  • Loading branch information
butonic authored and David Christofas committed Sep 9, 2021
1 parent 9f7bd74 commit 55061e1
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
1 change: 0 additions & 1 deletion tests/acceptance/expected-failures-on-S3NG-storage.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 55061e1

Please sign in to comment.