diff --git a/.drone.env b/.drone.env index 10f287fa4d..3971384b8f 100644 --- a/.drone.env +++ b/.drone.env @@ -3,5 +3,5 @@ CORE_COMMITID=ddd3b90f4aea35a459a6fedf78a9bcf110dc3303 CORE_BRANCH=master # The test runner source for UI tests -WEB_COMMITID=09120268c6bc311f3456bb6aef70b11e97618f51 +WEB_COMMITID=c8c69113bc7987d6f14e32e5f1e7bd1b5491b1d9 WEB_BRANCH=master diff --git a/changelog/unreleased/update-web-6.0.0-rc.1.md b/changelog/unreleased/update-web-6.0.0-rc.2.md similarity index 94% rename from changelog/unreleased/update-web-6.0.0-rc.1.md rename to changelog/unreleased/update-web-6.0.0-rc.2.md index 4ea4f599de..53513430d8 100644 --- a/changelog/unreleased/update-web-6.0.0-rc.1.md +++ b/changelog/unreleased/update-web-6.0.0-rc.2.md @@ -1,8 +1,8 @@ -Enhancement: Update ownCloud Web to v6.0.0-rc.1 +Enhancement: Update ownCloud Web to v6.0.0-rc.2 Tags: web -We updated ownCloud Web to v6.0.0-rc.1. Please refer to the changelog (linked) for details on the web release. +We updated ownCloud Web to v6.0.0-rc.2. Please refer to the changelog (linked) for details on the web release. ### Breaking changes * BREAKING CHANGE for users in [owncloud/web#6648](https://github.com/owncloud/web/issues/6648): breaks existing bookmarks - they won't resolve anymore. @@ -42,5 +42,5 @@ We updated ownCloud Web to v6.0.0-rc.1. Please refer to the changelog (linked) f * Enhancement [owncloud/web#7684](https://github.com/owncloud/web/pull/7684): Update ODS to v14.0.0-alpha.20 * Enhancement [owncloud/web#7430](https://github.com/owncloud/web/pull/7430): Webdav support in web-client package -https://github.com/owncloud/ocis/pull/4779 -https://github.com/owncloud/web/releases/tag/v6.0.0-rc.1 +https://github.com/owncloud/ocis/pull/4786 +https://github.com/owncloud/web/releases/tag/v6.0.0-rc.2 diff --git a/services/web/Makefile b/services/web/Makefile index 7de0a43ea6..df2a41bffe 100644 --- a/services/web/Makefile +++ b/services/web/Makefile @@ -1,6 +1,6 @@ SHELL := bash NAME := web -WEB_ASSETS_VERSION = v6.0.0-rc.1 +WEB_ASSETS_VERSION = v6.0.0-rc.2 include ../../.make/recursion.mk