From 528bb867b40c321be9ab02d4f17b6cfb89618c78 Mon Sep 17 00:00:00 2001 From: Jonas Date: Mon, 16 Jan 2023 16:32:51 +0100 Subject: [PATCH] Rename main Git development branch from `master` to `main` Avoid using terms associated with slavery and exploitation. Signed-off-by: Jonas --- .github/dependabot.yml | 2 +- .github/pull_request_template.md | 2 +- .github/workflows/cypress.yml | 2 +- .github/workflows/integration.yml | 1 + .github/workflows/lint.yml | 2 +- .github/workflows/nightly.yml | 4 ++-- .github/workflows/update-nextcloud-ocp.yml | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/User_documentation_en.md | 4 ++-- 10 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 051f0a30f..0684492a5 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -2,7 +2,7 @@ version: 2 updates: - package-ecosystem: npm directory: "/" - target-branch: "master" + target-branch: "main" schedule: interval: weekly day: saturday diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 46b2a66ff..82efd9397 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,6 +1,6 @@ * Resolves: # -* Target version: master +* Target version: main ### Summary diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index 18501012a..8a7426a15 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - master + - main - stable* env: diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 8b41e2783..92b874f7c 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -12,6 +12,7 @@ on: - 'composer.lock' push: branches: + - main - master - stable* diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 5ce6f8730..464a25473 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - master + - main - stable* jobs: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 0ffd784fb..9060f4c22 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -44,14 +44,14 @@ jobs: git config --local user.name "GitHub Action" git tag -f nightly - name: Push tag - uses: juliushaertl/github-push-action@master + uses: juliushaertl/github-push-action@main with: github_token: ${{ secrets.GITHUB_TOKEN }} tags: true force: true - name: Create Release id: create_release - uses: juliushaertl/action-release@master + uses: juliushaertl/action-release@main with: token: ${{ secrets.GITHUB_TOKEN }} tag: nightly diff --git a/.github/workflows/update-nextcloud-ocp.yml b/.github/workflows/update-nextcloud-ocp.yml index 06679a167..d99f1c823 100644 --- a/.github/workflows/update-nextcloud-ocp.yml +++ b/.github/workflows/update-nextcloud-ocp.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - branches: ["master", "stable25", "stable24", "stable23"] + branches: ["main", "stable25", "stable24", "stable23"] name: update-nextcloud-ocp-${{ matrix.branches }} diff --git a/README.md b/README.md index cf1ccaebe..991396042 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Deck -[![Build Status](https://travis-ci.org/nextcloud/deck.svg?branch=master)](https://travis-ci.org/nextcloud/deck) [![CodeCov](https://codecov.io/github/nextcloud/deck/coverage.svg?branch=master)](https://codecov.io/github/nextcloud/deck) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/e403f723f42a4abd93b2cfe36cbd7eee)](https://www.codacy.com/app/juliushaertl/deck?utm_source=github.com&utm_medium=referral&utm_content=nextcloud/deck&utm_campaign=Badge_Grade) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/deck/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nextcloud/deck/?branch=master) [![#nextcloud-deck](https://img.shields.io/badge/IRC-%23nextcloud--deck%20on%20freenode-blue.svg)](https://webchat.freenode.net/?channels=nextcloud-deck) +[![Build Status](https://travis-ci.org/nextcloud/deck.svg?branch=main)](https://travis-ci.org/nextcloud/deck) [![CodeCov](https://codecov.io/github/nextcloud/deck/coverage.svg?branch=main)](https://codecov.io/github/nextcloud/deck) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/e403f723f42a4abd93b2cfe36cbd7eee)](https://www.codacy.com/app/juliushaertl/deck?utm_source=github.com&utm_medium=referral&utm_content=nextcloud/deck&utm_campaign=Badge_Grade) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/deck/badges/quality-score.png?b=main)](https://scrutinizer-ci.com/g/nextcloud/deck/?branch=main) [![#nextcloud-deck](https://img.shields.io/badge/IRC-%23nextcloud--deck%20on%20freenode-blue.svg)](https://webchat.freenode.net/?channels=nextcloud-deck) Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud. diff --git a/SECURITY.md b/SECURITY.md index 056a0716f..4804d1f10 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -20,7 +20,7 @@ Your report should include: - Reproduction steps A member of the security team will confirm the vulnerability, determine its impact, and develop a fix. -The fix will be applied to the master branch, tested, and packaged in the next security release. +The fix will be applied to the main branch, tested, and packaged in the next security release. The vulnerability will be publicly announced after the release. Finally, your name will be added to the [hall of fame](https://hackerone.com/nextcloud/thanks) as a thank you from the entire Nextcloud community. Note our [threat model](https://nextcloud.com/security/threat-model) to know what is expected behavior. diff --git a/docs/User_documentation_en.md b/docs/User_documentation_en.md index c4b686caf..6a8c571a2 100644 --- a/docs/User_documentation_en.md +++ b/docs/User_documentation_en.md @@ -90,7 +90,7 @@ Steps: * Create the configuration file * Execute the import informing the import file path, data file and source as `Trello JSON` -Create the configuration file respecting the [JSON Schema](https://github.com/nextcloud/deck/blob/master/lib/Service/Importer/fixtures/config-trelloJson-schema.json) for import `Trello JSON` +Create the configuration file respecting the [JSON Schema](https://github.com/nextcloud/deck/blob/main/lib/Service/Importer/fixtures/config-trelloJson-schema.json) for import `Trello JSON` Example configuration file: ```json @@ -120,7 +120,7 @@ https://api.trello.com/1/members/me/boards?key={yourKey}&token={yourToken}&field This ID you will use in the configuration file in the `board` property * Create the configuration file -Create the configuration file respecting the [JSON Schema](https://github.com/nextcloud/deck/blob/master/lib/Service/Importer/fixtures/config-trelloApi-schema.json) for import `Trello JSON` +Create the configuration file respecting the [JSON Schema](https://github.com/nextcloud/deck/blob/main/lib/Service/Importer/fixtures/config-trelloApi-schema.json) for import `Trello JSON` Example configuration file: ```json