Merge branch 'develop' of https://github.com/vector-im/element-web into t3chguy/playwright-tenbin
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # .github/workflows/end-to-end-tests.yaml # package.json # playwright/e2e/crypto/backups-mas.spec.ts # playwright/e2e/csAPI.ts # playwright/e2e/login/utils.ts # playwright/e2e/right-panel/right-panel.spec.ts # playwright/e2e/spotlight/spotlight.spec.ts # playwright/element-web-test.ts # playwright/pages/client.ts # playwright/plugins/homeserver/index.ts # playwright/plugins/homeserver/synapse/legacyOAuthHomeserver.ts # playwright/plugins/oauth_server/index.ts # playwright/services.ts # playwright/testcontainers/HomeserverContainer.ts # playwright/testcontainers/dendrite.ts # playwright/testcontainers/mas.ts # playwright/testcontainers/synapse.ts # playwright/testcontainers/utils.ts # yarn.lock
This commit is contained in:
2
.github/workflows/tests.yml
vendored
2
.github/workflows/tests.yml
vendored
@@ -121,7 +121,7 @@ jobs:
|
||||
|
||||
- name: Skip SonarCloud in merge queue
|
||||
if: github.event_name == 'merge_group' || inputs.disable_coverage == 'true'
|
||||
uses: guibranco/github-status-action-v2@56cd38caf0615dd03f49d42ed301f1469911ac61
|
||||
uses: guibranco/github-status-action-v2@5ef6e175c333bc629f3718b083c8a2ff6e0bbfbc
|
||||
with:
|
||||
authToken: ${{ secrets.GITHUB_TOKEN }}
|
||||
state: success
|
||||
|
||||
Reference in New Issue
Block a user