Merge branch 'master' into chore/translations-update

Author: kobergj

.drone.env

@@ -1,3 +1,3 @@
 # The test runner source for UI tests
-WEB_COMMITID=6165b4e47a47e3a216107e96f90825190f10632e
+WEB_COMMITID=39d6215da6daa184cd2365966915a659bdbd2c8b
 WEB_BRANCH=stable-12.3

changelog/unreleased/enhancement-bump-web-to-12.3.3.md

@@ -0,0 +1,8 @@
+Enhancement: Bump Web to 12.3.3
+
+- Bugfix [owncloud/web#13638](https://github.com/owncloud/web/pull/13638): Share button not usable when role dropdown text is too long
+- Bugfix [owncloud/web#13667](https://github.com/owncloud/web/pull/13667): Shared with does not show members
+- Bugfix [owncloud/web#13680](https://github.com/owncloud/web/pull/13680): Escape strings when returned from server
+
+https://github.com/owncloud/web/pull/13705
+https://github.com/owncloud/web/releases/tag/v12.3.3

services/web/Makefile

@@ -1,6 +1,6 @@
 SHELL := bash
 NAME := web
-WEB_ASSETS_VERSION = v12.3.1
+WEB_ASSETS_VERSION = v12.3.3
 
 include ../../.make/recursion.mk
 

tests/config/drone/run_k6_tests.sh

@@ -9,6 +9,9 @@ if [ "$1" = "--ocis-log" ]; then
     exit 0
 fi
 
+# clean up from previous runs
+sshpass -p "$SSH_OCIS_PASSWORD" ssh $SSH_OPTS "$SSH_OCIS_USERNAME@$SSH_OCIS_REMOTE" "rm -rf k6-ocis"
+
 # start ocis server
 sshpass -p "$SSH_OCIS_PASSWORD" ssh $SSH_OPTS "$SSH_OCIS_USERNAME@$SSH_OCIS_REMOTE" \
     "OCIS_URL=${TEST_SERVER_URL} \