From b6e3e875aca542969af81fac2e9d357e964b44fb Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 13 Dec 2023 11:09:03 +0100 Subject: [PATCH] Organization renaming: `vector-im` -> `element-hq` --- .github/dependabot.yml | 4 ++-- .../workflows/sync-from-external-sources.yml | 6 ++--- .github/workflows/triage-incoming.yml | 4 ++-- .github/workflows/triage-labelled.yml | 22 +++++++++---------- .../workflows/triage-move-review-requests.yml | 8 +++---- .github/workflows/triage-priority-bugs.yml | 4 ++-- .github/workflows/triage-unlabelled.yml | 2 +- .github/workflows/update-gradle-wrapper.yml | 2 +- CHANGES.md | 2 +- dependencies_groups.gradle | 2 +- docs/pull_request.md | 4 ++-- .../android/fr-FR/changelogs/40103020.txt | 2 +- .../android/fr-FR/changelogs/40103030.txt | 2 +- .../android/uk/changelogs/40104280.txt | 2 +- 14 files changed, 33 insertions(+), 33 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 597f78f541..9ffb7fce64 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -11,7 +11,7 @@ updates: schedule: interval: "weekly" reviewers: - - "vector-im/element-android-reviewers" + - "element-hq/element-android-reviewers" ignore: - dependency-name: "*" # Updates for Gradle dependencies used in the app @@ -21,7 +21,7 @@ updates: interval: "daily" open-pull-requests-limit: 200 reviewers: - - "vector-im/element-android-reviewers" + - "element-hq/element-android-reviewers" allow: - dependency-name: "io.element.android:wysiwyg" - dependency-name: "org.matrix.rustcomponents:crypto-android" diff --git a/.github/workflows/sync-from-external-sources.yml b/.github/workflows/sync-from-external-sources.yml index ddb182f306..e9c725b976 100644 --- a/.github/workflows/sync-from-external-sources.yml +++ b/.github/workflows/sync-from-external-sources.yml @@ -9,7 +9,7 @@ jobs: sync-emojis: runs-on: ubuntu-latest # Skip in forks - if: github.repository == 'vector-im/element-android' + if: github.repository == 'element-hq/element-android' # No concurrency required, runs every time on a schedule. steps: - uses: actions/checkout@v3 @@ -36,7 +36,7 @@ jobs: sync-sas-strings: runs-on: ubuntu-latest # Skip in forks - if: github.repository == 'vector-im/element-android' + if: github.repository == 'element-hq/element-android' # No concurrency required, runs every time on a schedule. steps: - uses: actions/checkout@v3 @@ -62,7 +62,7 @@ jobs: sync-analytics-plan: runs-on: ubuntu-latest # Skip in forks - if: github.repository == 'vector-im/element-android' + if: github.repository == 'element-hq/element-android' # No concurrency required, runs every time on a schedule. steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/triage-incoming.yml b/.github/workflows/triage-incoming.yml index 4f9c239429..27575e3ea9 100644 --- a/.github/workflows/triage-incoming.yml +++ b/.github/workflows/triage-incoming.yml @@ -8,7 +8,7 @@ jobs: automate-project-columns: runs-on: ubuntu-latest # Skip in forks - if: github.repository == 'vector-im/element-android' + if: github.repository == 'element-hq/element-android' steps: - uses: alex-page/github-project-automation-plus@7ffb872c64bd809d23563a130a0a97d01dfa8f43 with: @@ -21,5 +21,5 @@ jobs: steps: - uses: actions/add-to-project@main with: - project-url: https://github.com/orgs/vector-im/projects/91 + project-url: https://github.com/orgs/element-hq/projects/91 github-token: ${{ secrets.ELEMENT_BOT_TOKEN }} diff --git a/.github/workflows/triage-labelled.yml b/.github/workflows/triage-labelled.yml index 0e995f5afc..e2da5ae816 100644 --- a/.github/workflows/triage-labelled.yml +++ b/.github/workflows/triage-labelled.yml @@ -51,7 +51,7 @@ jobs: name: X-Needs-Info issues to Need info column on triage board runs-on: ubuntu-latest # Skip in forks - if: github.repository == 'vector-im/element-android' + if: github.repository == 'element-hq/element-android' steps: - uses: konradpabjan/move-labeled-or-milestoned-issue@219d384e03fa4b6460cd24f9f37d19eb033a4338 with: @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-latest # Skip in forks if: > - github.repository == 'vector-im/element-android' && + github.repository == 'element-hq/element-android' && contains(github.event.issue.labels.*.name, 'X-Needs-Design') && (contains(github.event.issue.labels.*.name, 'S-Critical') && (contains(github.event.issue.labels.*.name, 'O-Frequent') || @@ -76,7 +76,7 @@ jobs: steps: - uses: actions/add-to-project@main with: - project-url: https://github.com/orgs/vector-im/projects/18 + project-url: https://github.com/orgs/element-hq/projects/18 github-token: ${{ secrets.ELEMENT_BOT_TOKEN }} add_product_issues: @@ -87,7 +87,7 @@ jobs: steps: - uses: actions/add-to-project@main with: - project-url: https://github.com/orgs/vector-im/projects/28 + project-url: https://github.com/orgs/element-hq/projects/28 github-token: ${{ secrets.ELEMENT_BOT_TOKEN }} move_element_x_issues: @@ -95,7 +95,7 @@ jobs: runs-on: ubuntu-latest # Skip in forks if: > - github.repository == 'vector-im/element-android' && + github.repository == 'element-hq/element-android' && (contains(github.event.issue.labels.*.name, 'Z-BBQ-Alpha') || contains(github.event.issue.labels.*.name, 'Z-BBQ-Beta') || contains(github.event.issue.labels.*.name, 'Z-BBQ-Release') || @@ -105,7 +105,7 @@ jobs: steps: - uses: actions/add-to-project@main with: - project-url: https://github.com/orgs/vector-im/projects/43 + project-url: https://github.com/orgs/element-hq/projects/43 github-token: ${{ secrets.ELEMENT_BOT_TOKEN }} ex_plorers: @@ -116,7 +116,7 @@ jobs: steps: - uses: actions/add-to-project@main with: - project-url: https://github.com/orgs/vector-im/projects/73 + project-url: https://github.com/orgs/element-hq/projects/73 github-token: ${{ secrets.ELEMENT_BOT_TOKEN }} ps_features1: @@ -132,7 +132,7 @@ jobs: steps: - uses: actions/add-to-project@main with: - project-url: https://github.com/orgs/vector-im/projects/56 + project-url: https://github.com/orgs/element-hq/projects/56 github-token: ${{ secrets.ELEMENT_BOT_TOKEN }} ps_features2: @@ -144,7 +144,7 @@ jobs: steps: - uses: actions/add-to-project@main with: - project-url: https://github.com/orgs/vector-im/projects/58 + project-url: https://github.com/orgs/element-hq/projects/58 github-token: ${{ secrets.ELEMENT_BOT_TOKEN }} ps_features3: @@ -155,7 +155,7 @@ jobs: steps: - uses: actions/add-to-project@main with: - project-url: https://github.com/orgs/vector-im/projects/57 + project-url: https://github.com/orgs/element-hq/projects/57 github-token: ${{ secrets.ELEMENT_BOT_TOKEN }} voip: @@ -166,5 +166,5 @@ jobs: steps: - uses: actions/add-to-project@main with: - project-url: https://github.com/orgs/vector-im/projects/41 + project-url: https://github.com/orgs/element-hq/projects/41 github-token: ${{ secrets.ELEMENT_BOT_TOKEN }} diff --git a/.github/workflows/triage-move-review-requests.yml b/.github/workflows/triage-move-review-requests.yml index f604b82873..7299f74f00 100644 --- a/.github/workflows/triage-move-review-requests.yml +++ b/.github/workflows/triage-move-review-requests.yml @@ -8,7 +8,7 @@ jobs: name: Move PRs asking for design review to the design board runs-on: ubuntu-latest # Skip in forks - if: github.repository == 'vector-im/element-android' + if: github.repository == 'element-hq/element-android' steps: - uses: octokit/graphql-action@v2.x id: find_team_members @@ -16,7 +16,7 @@ jobs: headers: '{"GraphQL-Features": "projects_next_graphql"}' query: | query find_team_members($team: String!) { - organization(login: "vector-im") { + organization(login: "element-hq") { team(slug: $team) { members { nodes { @@ -77,7 +77,7 @@ jobs: name: Move PRs asking for product review to the product board runs-on: ubuntu-latest # Skip in forks - if: github.repository == 'vector-im/element-android' + if: github.repository == 'element-hq/element-android' steps: - uses: octokit/graphql-action@v2.x id: find_team_members @@ -85,7 +85,7 @@ jobs: headers: '{"GraphQL-Features": "projects_next_graphql"}' query: | query find_team_members($team: String!) { - organization(login: "vector-im") { + organization(login: "element-hq") { team(slug: $team) { members { nodes { diff --git a/.github/workflows/triage-priority-bugs.yml b/.github/workflows/triage-priority-bugs.yml index c109b06b7e..3e1093b578 100644 --- a/.github/workflows/triage-priority-bugs.yml +++ b/.github/workflows/triage-priority-bugs.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest # Skip in forks if: > - github.repository == 'vector-im/element-android' && + github.repository == 'element-hq/element-android' && (!contains(github.event.issue.labels.*.name, 'A-E2EE') && !contains(github.event.issue.labels.*.name, 'A-E2EE-Cross-Signing') && !contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') && @@ -34,7 +34,7 @@ jobs: runs-on: ubuntu-latest # Skip in forks if: > - github.repository == 'vector-im/element-android' && + github.repository == 'element-hq/element-android' && (contains(github.event.issue.labels.*.name, 'Z-UISI') || (contains(github.event.issue.labels.*.name, 'A-E2EE') || contains(github.event.issue.labels.*.name, 'A-E2EE-Cross-Signing') || diff --git a/.github/workflows/triage-unlabelled.yml b/.github/workflows/triage-unlabelled.yml index e29a79e2e7..cd2da844d0 100644 --- a/.github/workflows/triage-unlabelled.yml +++ b/.github/workflows/triage-unlabelled.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest # Skip in forks if: > - github.repository == 'vector-im/element-android' && + github.repository == 'element-hq/element-android' && !contains(github.event.issue.labels.*.name, 'X-Needs-Info') env: BOARD_NAME: "Issue triage" diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml index 63aaae15a5..338e2b2c17 100644 --- a/.github/workflows/update-gradle-wrapper.yml +++ b/.github/workflows/update-gradle-wrapper.yml @@ -14,7 +14,7 @@ jobs: - name: Update Gradle Wrapper uses: gradle-update/update-gradle-wrapper-action@v1 # Skip in forks - if: github.repository == 'vector-im/element-android' + if: github.repository == 'element-hq/element-android' with: repo-token: ${{ secrets.GITHUB_TOKEN }} target-branch: develop diff --git a/CHANGES.md b/CHANGES.md index 41cc5b851e..660d2b529e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2202,7 +2202,7 @@ Changes in Element v1.1.13 (2021-07-19) Features ✨ ---------- - - Remove redundant mimetype (vector-im/element-web#2547) ([#3273](https://github.com/element-hq/element-android/issues/3273)) + - Remove redundant mimetype (element-hq/element-web#2547) ([#3273](https://github.com/element-hq/element-android/issues/3273)) - Room version capabilities and room upgrade support, better error feedback ([#3551](https://github.com/element-hq/element-android/issues/3551)) - Add retry support in room addresses screen ([#3635](https://github.com/element-hq/element-android/issues/3635)) - Better management of permission requests ([#3667](https://github.com/element-hq/element-android/issues/3667)) diff --git a/dependencies_groups.gradle b/dependencies_groups.gradle index c023eab2eb..a6ddd5c799 100644 --- a/dependencies_groups.gradle +++ b/dependencies_groups.gradle @@ -5,12 +5,12 @@ ext.groups = [ group: [ 'com.github.Armen101', 'com.github.chrisbanes', + 'com.github.element-hq', 'com.github.hyuwah', 'com.github.jetradarmobile', 'com.github.MatrixFrog', 'com.github.tapadoo', 'com.github.UnifiedPush', - 'com.github.vector-im', 'com.github.yalantis', 'com.github.Zhuinden', ] diff --git a/docs/pull_request.md b/docs/pull_request.md index 7f6ac86b8a..703abd4d8f 100644 --- a/docs/pull_request.md +++ b/docs/pull_request.md @@ -86,13 +86,13 @@ Exceptions can occur: We use automatic assignment for PR reviews. **A PR is automatically routed by GitHub to one team member** using the round robin algorithm. Additional reviewers can be used for complex changes or when the first reviewer is not confident enough on the changes. The process is the following: -- The PR creator selects the [element-android-reviewers](https://github.com/orgs/vector-im/teams/element-android-reviewers) team as a reviewer. +- The PR creator selects the [element-android-reviewers](https://github.com/orgs/element-hq/teams/element-android-reviewers) team as a reviewer. - GitHub automatically assign the reviewer. If the reviewer is not available (holiday, etc.), remove them and set again the team, GitHub will select another reviewer. - Alternatively, the PR creator can directly assign specific people if they have another Android developer in their team or they think a specific reviewer should take a look at their PR. - Reviewers get a notification to make the review: they review the code following the good practice (see the rest of this document). - After making their own review, if they feel not confident enough, they can ask another person for a full review, or they can tag someone within a PR comment to check specific lines. -For PRs coming from the community, the issue wrangler can assign either the team [element-android-reviewers](https://github.com/orgs/vector-im/teams/element-android-reviewers) or any member directly. +For PRs coming from the community, the issue wrangler can assign either the team [element-android-reviewers](https://github.com/orgs/element-hq/teams/element-android-reviewers) or any member directly. ##### PR review time diff --git a/fastlane/metadata/android/fr-FR/changelogs/40103020.txt b/fastlane/metadata/android/fr-FR/changelogs/40103020.txt index 8a4868cee5..b6afed2617 100644 --- a/fastlane/metadata/android/fr-FR/changelogs/40103020.txt +++ b/fastlane/metadata/android/fr-FR/changelogs/40103020.txt @@ -1,2 +1,2 @@ Principaux changements pour cette version : Ajout du support pour Android Auto. Beaucoup de corrections de bogues ! -Liste de tous les changements : https ://github.com/vector-im/element-android/releases/tag/v1.3.2 +Liste de tous les changements : https://github.com/element-hq/element-android/releases/tag/v1.3.2 diff --git a/fastlane/metadata/android/fr-FR/changelogs/40103030.txt b/fastlane/metadata/android/fr-FR/changelogs/40103030.txt index 0130080ca7..4e98c36e18 100644 --- a/fastlane/metadata/android/fr-FR/changelogs/40103030.txt +++ b/fastlane/metadata/android/fr-FR/changelogs/40103030.txt @@ -1,2 +1,2 @@ Principaux changements pour cette version : Affiche le(s) politique(s) des serveurs d’identité dans les réglages. Retrait temporaire du support d’Android Auto -Liste de tous les changements : https ://github.com/vector-im/element-android/releases/tag/v1.3.3 +Liste de tous les changements : https://github.com/element-hq/element-android/releases/tag/v1.3.3 diff --git a/fastlane/metadata/android/uk/changelogs/40104280.txt b/fastlane/metadata/android/uk/changelogs/40104280.txt index 82eef725e0..883e6e697e 100644 --- a/fastlane/metadata/android/uk/changelogs/40104280.txt +++ b/fastlane/metadata/android/uk/changelogs/40104280.txt @@ -1,2 +1,2 @@ Основні зміни в цій версії: Усунуто різні вади й поліпшено стабільність. -Перелік усіх змін://github.com/vector-im/element-android/releases +Перелік усіх https://github.com/element-hq/element-android/releases