Skip to content

Commit

Permalink
Merge branch 'master' into add_expose_docker_image
Browse files Browse the repository at this point in the history
  • Loading branch information
wkloucek authored Jan 21, 2021
2 parents b749ffe + 1bc644f commit d0c90d1
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .drone.env
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# The test runner source for API tests
CORE_COMMITID=35a5eca3a1e15e7e25df2e454e877fad048d6d25
CORE_COMMITID=4a671a34a2f039c83520b5a72dd886b3a974a85e
CORE_BRANCH=master

# The test runner source for UI tests
WEB_COMMITID=2aab6025e5507b3d95cca5912ca53fc482563e95
WEB_COMMITID=5878eeb7a9d7a1ef9259c1942d0ac8be57ecef02
WEB_BRANCH=master
18 changes: 9 additions & 9 deletions tests/acceptance/expected-failures-webUI-on-OWNCLOUD-storage.md
Original file line number Diff line number Diff line change
Expand Up @@ -274,11 +274,11 @@ Other free text and markdown formatting can be used elsewhere in the document if
- [webUISharingPublicExpire/shareByPublicLinkExpiringLinks.feature:100](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicExpire/shareByPublicLinkExpiringLinks.feature#L100)
- [webUISharingPublicExpire/shareByPublicLinkExpiringLinks.feature:123](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicExpire/shareByPublicLinkExpiringLinks.feature#L123)
- [webUISharingPublicExpire/shareByPublicLinkExpiringLinks.feature:139](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicExpire/shareByPublicLinkExpiringLinks.feature#L139)
- [webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:311](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature#L311)
- [webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:319](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature#L319)
- [webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:328](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature#L328)
- [webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:337](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature#L337)
- [webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:346](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature#L346)
- [webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:312](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature#L312)
- [webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:320](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature#L320)
- [webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:329](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature#L329)
- [webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:338](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature#L338)
- [webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:347](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature#L347)

### [[OCIS] declining a received share gives 500 error even if the share is declined](https://github.com/owncloud/product/issues/276)
- [webUISharingAcceptShares/acceptShares.feature:124](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L124)
Expand Down Expand Up @@ -413,10 +413,10 @@ Other free text and markdown formatting can be used elsewhere in the document if
- [webUISharingPermissionsUsers/sharePermissionsUsers.feature:32](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature#L32)
- [webUISharingPermissionsUsers/sharePermissionsUsers.feature:136](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature#L136)
- [webUISharingPublic/shareByPublicLink.feature:791](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublic/shareByPublicLink.feature#L791)
- [webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:122](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature#L122)
- [webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:298](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature#L298)
- [webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:275](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature#L275)
- [webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:212](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature#L212)
- [webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:123](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature#L123)
- [webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:299](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature#L299)
- [webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:276](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature#L276)
- [webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:213](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature#L213)

### [renamed file cannot be shared](https://github.com/owncloud/web/issues/4192)
- [webUISharingInternalUsers/shareWithUsers.feature:595](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature#L595)

0 comments on commit d0c90d1

Please sign in to comment.