diff --git a/.drone.env b/.drone.env index 3ee3c14b92d..9c211f96b76 100644 --- a/.drone.env +++ b/.drone.env @@ -3,5 +3,5 @@ CORE_COMMITID=cb9a31fd45721406ee150682d86e29e1b2e8b0d8 CORE_BRANCH=master # The test runner source for UI tests -WEB_COMMITID=262398e513253d3296792434ecc4a96fa1c19a73 -WEB_BRANCH=testSharesFolderAlwaysVisible +WEB_COMMITID=e84960674723d8fb8c3c42e1ada8ef8cc1747ba6 +WEB_BRANCH=master diff --git a/changelog/unreleased/update-5.0.0.md b/changelog/unreleased/update-5.0.0.md new file mode 100644 index 00000000000..e55537eaa4e --- /dev/null +++ b/changelog/unreleased/update-5.0.0.md @@ -0,0 +1,10 @@ +Enhancement: Update ownCloud Web to v5.0.0 + +Tags: web + +We updated ownCloud Web to v5.0.0. Please refer to the changelog (linked) for details on the web release. + +https://github.com/owncloud/ocis/pull/2895 +https://github.com/owncloud/ocis/pull/3157 +https://github.com/owncloud/web/releases/tag/v4.8.0 +https://github.com/owncloud/web/releases/tag/v5.0.0 diff --git a/changelog/unreleased/update-web-4.8.0.md b/changelog/unreleased/update-web-4.8.0.md deleted file mode 100644 index a4956808eb7..00000000000 --- a/changelog/unreleased/update-web-4.8.0.md +++ /dev/null @@ -1,8 +0,0 @@ -Enhancement: Update ownCloud Web to v4.8.0 - -Tags: web - -We updated ownCloud Web to v4.8.0. Please refer to the changelog (linked) for details on the web release. - -https://github.com/owncloud/ocis/pull/2895 -https://github.com/owncloud/web/releases/tag/v4.8.0 diff --git a/web/Makefile b/web/Makefile index af5203a1cf0..1806a1b0294 100644 --- a/web/Makefile +++ b/web/Makefile @@ -29,7 +29,7 @@ ci-go-generate: # CI runs ci-node-generate automatically before this target .PHONY: ci-node-generate ci-node-generate: pull-assets -WEB_ASSETS_VERSION = v4.8.0 +WEB_ASSETS_VERSION = v5.0.0-rc .PHONY: pull-assets pull-assets: