Merge branch 'staging'

.github/CODEOWNERS

@@ -2,3 +2,4 @@
 /.github/workflows/**     @vector-im/element-web-app-team
 /package.json             @vector-im/element-web-app-team
 /yarn.lock                @vector-im/element-web-app-team
+/src/i18n/strings

.github/release-drafter.yml

@@ -0,0 +1 @@
+_extends: vector-im/element-web

.github/workflows/build_and_test.yaml

@@ -41,13 +41,13 @@ jobs:
 
             - name: "Get modified files"
               id: changed_files
-              uses: tj-actions/changed-files@95690f9ece77c1740f4a55b7f1de9023ed6b1f87 # v39
+              uses: tj-actions/changed-files@40526807ee1e208a1a8c1bbe6bd2d1b044ef6368 # v40
               with:
                   files: |
-                      dockerbuild/*
+                      dockerbuild/**
             - name: Log in to the Container registry
               if: steps.changed_files.outputs.any_modified == 'true'
-              uses: docker/login-action@b4bedf8053341df3b5a9f9e0f2cf4e79e27360c6
+              uses: docker/login-action@1f401f745bf57e30b3a2800ad308a87d2ebdf14b
               with:
                   registry: ${{ env.REGISTRY }}
                   username: ${{ github.actor }}

.github/workflows/dockerbuild.yaml

@@ -20,7 +20,7 @@ jobs:
             - uses: actions/checkout@v3
 
             - name: Log in to the Container registry
-              uses: docker/login-action@b4bedf8053341df3b5a9f9e0f2cf4e79e27360c6
+              uses: docker/login-action@1f401f745bf57e30b3a2800ad308a87d2ebdf14b
               with:
                   registry: ${{ env.REGISTRY }}
                   username: ${{ github.actor }}
@@ -28,7 +28,7 @@ jobs:
 
             - name: Extract metadata for Docker
               id: meta
-              uses: docker/metadata-action@879dcbb708d40f8b8679d4f7941b938a086e23a7
+              uses: docker/metadata-action@62339db73c56dd749060f65a6ebb93a6e056b755
               with:
                   images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
                   tags: |

.github/workflows/release-drafter.yml

@@ -0,0 +1,30 @@
+name: Release Drafter
+on:
+    push:
+        branches: [staging]
+concurrency: ${{ github.workflow }}
+jobs:
+    element-web:
+        runs-on: ubuntu-latest
+        outputs:
+            version: ${{ steps.release.outputs.tag_name }}
+        steps:
+            - name: Get draft release
+              id: release
+              uses: cardinalby/git-get-release-action@cedef2faf69cb7c55b285bad07688d04430b7ada # v1
+              env:
+                  GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+                  repo: vector-im/element-web
+              with:
+                  latest: true
+
+    draft:
+        needs: element-web
+        runs-on: ubuntu-latest
+        steps:
+            - uses: release-drafter/release-drafter@dabcf3767562210392d862070ed2ef6434b9bc6f # v5
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              with:
+                  disable-autolabeler: true
+                  version-template: ${{ needs.element-web.outputs.version }}

.github/workflows/release-gitflow.yml

@@ -0,0 +1,11 @@
+# Gitflow merge-back master->develop
+name: Merge master -> develop
+on:
+    push:
+        branches: [master]
+concurrency: ${{ github.repository }}-${{ github.workflow }}
+jobs:
+    merge:
+        uses: matrix-org/matrix-js-sdk/.github/workflows/release-gitflow.yml@develop
+        secrets:
+            ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

.github/workflows/release.yml

@@ -0,0 +1,22 @@
+name: Release Process
+on:
+    workflow_dispatch:
+        inputs:
+            mode:
+                description: What type of release
+                required: true
+                default: rc
+                type: choice
+                options:
+                    - rc
+                    - final
+concurrency: ${{ github.workflow }}
+jobs:
+    release:
+        uses: matrix-org/matrix-js-sdk/.github/workflows/release-action.yml@develop
+        secrets: inherit
+        with:
+            final: ${{ inputs.mode == 'final' }}
+            include-changes: vector-im/element-web@$VERSION
+            gpg-fingerprint: ${{ vars.GPG_FINGERPRINT }}
+            expected-asset-count: 1

.github/workflows/triage-labelled.yml

@@ -0,0 +1,10 @@
+name: Move labelled issues to correct projects
+
+on:
+    issues:
+        types: [labeled]
+
+jobs:
+    call-triage-labelled:
+        uses: vector-im/element-web/.github/workflows/triage-labelled.yml@develop
+        secrets: inherit

CHANGELOG.md

@@ -1,3 +1,9 @@
+Changes in [1.11.50](https://github.com/vector-im/element-desktop/releases/tag/v1.11.50) (2023-11-21)
+=====================================================================================================
+
+
+
+
 Changes in [1.11.49](https://github.com/vector-im/element-desktop/releases/tag/v1.11.49) (2023-11-13)
 =====================================================================================================
 

package.json

@@ -2,7 +2,7 @@
     "name": "element-desktop",
     "productName": "Element",
     "main": "lib/electron-main.js",
-    "version": "1.11.49",
+    "version": "1.11.50",
     "description": "A feature-rich client for Matrix.org",
     "author": "Element",
     "homepage": "https://element.io",
@@ -73,7 +73,6 @@
         "@babel/preset-env": "^7.18.10",
         "@babel/preset-typescript": "^7.18.6",
         "@electron/asar": "^3.2.3",
-        "@electron/notarize": "^2.0.0",
         "@types/auto-launch": "^5.0.1",
         "@types/counterpart": "^0.18.1",
         "@types/detect-libc": "^1.0.0",
@@ -87,20 +86,20 @@
         "@typescript-eslint/eslint-plugin": "^5.42.0",
         "@typescript-eslint/parser": "^5.42.0",
         "allchange": "^1.0.6",
-        "app-builder-lib": "24.7.0",
+        "app-builder-lib": "24.8.0",
         "babel-jest": "^29.0.0",
         "chokidar": "^3.5.2",
         "detect-libc": "^1.0.3",
         "electron": "^27.0.0",
         "electron-builder": "24.6.4",
-        "electron-builder-squirrel-windows": "24.7.0",
+        "electron-builder-squirrel-windows": "24.8.0",
         "electron-devtools-installer": "^3.2.0",
         "eslint": "^8.26.0",
         "eslint-config-google": "^0.14.0",
         "eslint-config-prettier": "^9.0.0",
         "eslint-plugin-import": "^2.25.4",
         "eslint-plugin-matrix-org": "^1.0.0",
-        "eslint-plugin-unicorn": "^48.0.0",
+        "eslint-plugin-unicorn": "^49.0.0",
         "expect-playwright": "^0.8.0",
         "find-npm-prefix": "^1.0.2",
         "fs-extra": "^11.0.0",
@@ -123,7 +122,7 @@
         "keytar": "^7.9.0"
     },
     "resolutions": {
-        "@types/node": "16.18.52"
+        "@types/node": "16.18.59"
     },
     "build": {
         "appId": "im.riot.app",