From 421293eb576ec6a059707f0d4ca2aaa5f7a253d7 Mon Sep 17 00:00:00 2001
From: Florian Schade <f.schade@icloud.com>
Date: Thu, 3 Mar 2022 18:14:51 +0100
Subject: [PATCH 1/2] bump web 5.2.0

---
 .drone.env                               | 2 +-
 accounts/package.json                    | 2 +-
 changelog/unreleased/update-web-5.1.0.md | 8 --------
 changelog/unreleased/update-web-5.2.0.md | 9 +++++++++
 settings/package.json                    | 2 +-
 web/Makefile                             | 2 +-
 6 files changed, 13 insertions(+), 12 deletions(-)
 delete mode 100644 changelog/unreleased/update-web-5.1.0.md
 create mode 100644 changelog/unreleased/update-web-5.2.0.md

diff --git a/.drone.env b/.drone.env
index c0081b7e92e..6225affdba1 100644
--- a/.drone.env
+++ b/.drone.env
@@ -3,5 +3,5 @@ CORE_COMMITID=4512f46e7196a8c1f1cfc56ec397628cbf540407
 CORE_BRANCH=master
 
 # The test runner source for UI tests
-WEB_COMMITID=1318eaad950cbeaaf6e30bcbfe998515a932be23
+WEB_COMMITID=b240ba9117e998edc0cd7d1d5586ba19591e1511
 WEB_BRANCH=master
diff --git a/accounts/package.json b/accounts/package.json
index 5db78147f2a..4782ef2970f 100644
--- a/accounts/package.json
+++ b/accounts/package.json
@@ -80,7 +80,7 @@
     "xml-js": "^1.6.11"
   },
   "peerDependencies": {
-    "owncloud-design-system": "^12.1.0"
+    "owncloud-design-system": "^12.2.2"
   },
   "packageManager": "yarn@3.1.0"
 }
diff --git a/changelog/unreleased/update-web-5.1.0.md b/changelog/unreleased/update-web-5.1.0.md
deleted file mode 100644
index 42ff5f7b74e..00000000000
--- a/changelog/unreleased/update-web-5.1.0.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Enhancement: Update ownCloud Web to v5.1.0
-
-Tags: web
-
-We updated ownCloud Web to v5.1.0. Please refer to the changelog (linked) for details on the web release.
-
-https://github.com/owncloud/ocis/pull/3202
-https://github.com/owncloud/web/releases/tag/v5.1.0
diff --git a/changelog/unreleased/update-web-5.2.0.md b/changelog/unreleased/update-web-5.2.0.md
new file mode 100644
index 00000000000..a3d3299f602
--- /dev/null
+++ b/changelog/unreleased/update-web-5.2.0.md
@@ -0,0 +1,9 @@
+Enhancement: Update ownCloud Web to v5.2.0
+
+Tags: web
+
+We updated ownCloud Web to v5.2.0. Please refer to the changelog (linked) for details on the web release.
+
+https://github.com/owncloud/web/pull/6506
+https://github.com/owncloud/ocis/pull/3202
+https://github.com/owncloud/web/releases/tag/v5.2.0
diff --git a/settings/package.json b/settings/package.json
index 427e9696965..b229e1ffafe 100644
--- a/settings/package.json
+++ b/settings/package.json
@@ -80,6 +80,6 @@
     "xml-js": "^1.6.11"
   },
   "peerDependencies": {
-    "owncloud-design-system": "^12.1.0"
+    "owncloud-design-system": "^12.2.2"
   }
 }
diff --git a/web/Makefile b/web/Makefile
index 71238f7de78..ceddd070c95 100644
--- a/web/Makefile
+++ b/web/Makefile
@@ -1,6 +1,6 @@
 SHELL := bash
 NAME := web
-WEB_ASSETS_VERSION = v5.2.0-rc.2
+WEB_ASSETS_VERSION = v5.2.0
 
 include ../.make/recursion.mk
 

From 6346d46e9aab1d3c0c5140f5320bb3185915d298 Mon Sep 17 00:00:00 2001
From: Florian Schade <f.schade@icloud.com>
Date: Thu, 3 Mar 2022 18:53:42 +0100
Subject: [PATCH 2/2] update accounts yarn lock

---
 accounts/yarn.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/accounts/yarn.lock b/accounts/yarn.lock
index d7c8ab4dfe4..d099dff1f29 100644
--- a/accounts/yarn.lock
+++ b/accounts/yarn.lock
@@ -8347,7 +8347,7 @@ __metadata:
     vuex: ^3.5.1
     xml-js: ^1.6.11
   peerDependencies:
-    owncloud-design-system: ^12.1.0
+    owncloud-design-system: ^12.2.2
   languageName: unknown
   linkType: soft