Rename main Git development branch from master to main

Avoid using terms associated with slavery and exploitation.

Signed-off-by: Jonas <jonas@freesources.org>
This commit is contained in:
Jonas
2023-01-16 16:32:51 +01:00
parent 2cceb58826
commit 528bb867b4
10 changed files with 12 additions and 11 deletions

View File

@@ -2,7 +2,7 @@ version: 2
updates: updates:
- package-ecosystem: npm - package-ecosystem: npm
directory: "/" directory: "/"
target-branch: "master" target-branch: "main"
schedule: schedule:
interval: weekly interval: weekly
day: saturday day: saturday

View File

@@ -1,6 +1,6 @@
* Resolves: # <!-- related github issue --> * Resolves: # <!-- related github issue -->
* Target version: master * Target version: main
### Summary ### Summary

View File

@@ -4,7 +4,7 @@ on:
pull_request: pull_request:
push: push:
branches: branches:
- master - main
- stable* - stable*
env: env:

View File

@@ -12,6 +12,7 @@ on:
- 'composer.lock' - 'composer.lock'
push: push:
branches: branches:
- main
- master - master
- stable* - stable*

View File

@@ -4,7 +4,7 @@ on:
pull_request: pull_request:
push: push:
branches: branches:
- master - main
- stable* - stable*
jobs: jobs:

View File

@@ -44,14 +44,14 @@ jobs:
git config --local user.name "GitHub Action" git config --local user.name "GitHub Action"
git tag -f nightly git tag -f nightly
- name: Push tag - name: Push tag
uses: juliushaertl/github-push-action@master uses: juliushaertl/github-push-action@main
with: with:
github_token: ${{ secrets.GITHUB_TOKEN }} github_token: ${{ secrets.GITHUB_TOKEN }}
tags: true tags: true
force: true force: true
- name: Create Release - name: Create Release
id: create_release id: create_release
uses: juliushaertl/action-release@master uses: juliushaertl/action-release@main
with: with:
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
tag: nightly tag: nightly

View File

@@ -17,7 +17,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
branches: ["master", "stable25", "stable24", "stable23"] branches: ["main", "stable25", "stable24", "stable23"]
name: update-nextcloud-ocp-${{ matrix.branches }} name: update-nextcloud-ocp-${{ matrix.branches }}

View File

@@ -1,6 +1,6 @@
# Deck # 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&amp;utm_medium=referral&amp;utm_content=nextcloud/deck&amp;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&amp;utm_medium=referral&amp;utm_content=nextcloud/deck&amp;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. Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.

View File

@@ -20,7 +20,7 @@ Your report should include:
- Reproduction steps - Reproduction steps
A member of the security team will confirm the vulnerability, determine its impact, and develop a fix. 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 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 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. [threat model](https://nextcloud.com/security/threat-model) to know what is expected behavior.

View File

@@ -90,7 +90,7 @@ Steps:
* Create the configuration file * Create the configuration file
* Execute the import informing the import file path, data file and source as `Trello JSON` * 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: Example configuration file:
```json ```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 This ID you will use in the configuration file in the `board` property
* Create the configuration file * 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: Example configuration file:
```json ```json