-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'v1.11.12' into upgrade/element-web-v1.11.12. Patches not f…
…ixed yet. * Fix config.json failing to load for Jitsi wrapper in non-root deployment ([\#23577](element-hq/element-web#23577)).
- Loading branch information
Showing
50 changed files
with
1,298 additions
and
890 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -229,3 +229,81 @@ jobs: | |
| env: | ||
| PROJECT_ID: "PN_kwDOAM0swc4AArk0" | ||
| GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} | ||
|
|
||
| ps_features1: | ||
| name: Add labelled issues to PS features team 1 | ||
| runs-on: ubuntu-latest | ||
| if: > | ||
| contains(github.event.issue.labels.*.name, 'A-Polls') || | ||
| contains(github.event.issue.labels.*.name, 'A-Location-Sharing') || | ||
| (contains(github.event.issue.labels.*.name, 'A-Voice-Messages') && | ||
| !contains(github.event.issue.labels.*.name, 'A-Broadcast')) || | ||
| (contains(github.event.issue.labels.*.name, 'A-Session-Mgmt') && | ||
| contains(github.event.issue.labels.*.name, 'A-User-Settings')) | ||
| steps: | ||
| - uses: octokit/[email protected] | ||
| id: add_to_project | ||
| with: | ||
| headers: '{"GraphQL-Features": "projects_next_graphql"}' | ||
| query: | | ||
| mutation add_to_project($projectid:ID!,$contentid:ID!) { | ||
| addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) { | ||
| item { | ||
| id | ||
| } | ||
| } | ||
| } | ||
| projectid: ${{ env.PROJECT_ID }} | ||
| contentid: ${{ github.event.issue.node_id }} | ||
| env: | ||
| PROJECT_ID: "PVT_kwDOAM0swc4AHJKF" | ||
| GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} | ||
|
|
||
| ps_features2: | ||
| name: Add labelled issues to PS features team 2 | ||
| runs-on: ubuntu-latest | ||
| if: > | ||
| contains(github.event.issue.labels.*.name, 'A-DM-Start') || | ||
| contains(github.event.issue.labels.*.name, 'A-Broadcast') | ||
| steps: | ||
| - uses: octokit/[email protected] | ||
| id: add_to_project | ||
| with: | ||
| headers: '{"GraphQL-Features": "projects_next_graphql"}' | ||
| query: | | ||
| mutation add_to_project($projectid:ID!,$contentid:ID!) { | ||
| addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) { | ||
| item { | ||
| id | ||
| } | ||
| } | ||
| } | ||
| projectid: ${{ env.PROJECT_ID }} | ||
| contentid: ${{ github.event.issue.node_id }} | ||
| env: | ||
| PROJECT_ID: "PVT_kwDOAM0swc4AHJKd" | ||
| GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} | ||
|
|
||
| ps_features3: | ||
| name: Add labelled issues to PS features team 3 | ||
| runs-on: ubuntu-latest | ||
| if: > | ||
| contains(github.event.issue.labels.*.name, 'A-Composer-WYSIWYG') | ||
| steps: | ||
| - uses: octokit/[email protected] | ||
| id: add_to_project | ||
| with: | ||
| headers: '{"GraphQL-Features": "projects_next_graphql"}' | ||
| query: | | ||
| mutation add_to_project($projectid:ID!,$contentid:ID!) { | ||
| addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) { | ||
| item { | ||
| id | ||
| } | ||
| } | ||
| } | ||
| projectid: ${{ env.PROJECT_ID }} | ||
| contentid: ${{ github.event.issue.node_id }} | ||
| env: | ||
| PROJECT_ID: "PVT_kwDOAM0swc4AHJKW" | ||
| GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,8 +12,7 @@ then | |
| exit | ||
| fi | ||
|
|
||
| set -e | ||
| set -x | ||
| set -ex | ||
|
|
||
| tmpdir=`mktemp -d 2>/dev/null || mktemp -d -t 'icontmp'` | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.