paulmataruso/zulip-desktop
1
0
Fork 0
mirror of https://github.com/zulip/zulip-desktop.git synced 2025-11-04 05:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename master branch to main.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2021-01-22 12:13:14 -08:00
parent 762dd92ec3
commit fa6d72268f
8 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/node.js.yml vendored
View File

@@ -2,9 +2,9 @@ name: Node.js CI
on:
push:
branches: [master]
branches: [main]
pull_request:
branches: [master]
branches: [main]
jobs:
build:

4
README.md
View File

@@ -1,6 +1,6 @@
# Zulip Desktop Client
[![Build Status](https://travis-ci.com/zulip/zulip-desktop.svg?branch=master)](https://travis-ci.com/github/zulip/zulip-desktop)
[![Windows Build Status](https://ci.appveyor.com/api/projects/status/github/zulip/zulip-desktop?branch=master&svg=true)](https://ci.appveyor.com/project/zulip/zulip-desktop/branch/master)
[![Build Status](https://travis-ci.com/zulip/zulip-desktop.svg?branch=main)](https://travis-ci.com/github/zulip/zulip-desktop)
[![Windows Build Status](https://ci.appveyor.com/api/projects/status/github/zulip/zulip-desktop?branch=main&svg=true)](https://ci.appveyor.com/project/zulip/zulip-desktop/branch/main)
[![XO code style](https://img.shields.io/badge/code_style-XO-5ed9c7.svg)](https://github.com/sindresorhus/xo)
[![project chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://chat.zulip.org)

2
app/renderer/about.html
View File

@@ -18,7 +18,7 @@
</p>
<p class="detail license">
Available under the
<a href="https://github.com/zulip/zulip-desktop/blob/master/LICENSE" target="_blank" rel="noopener noreferrer">Apache 2.0 License</a>
<a href="https://github.com/zulip/zulip-desktop/blob/main/LICENSE" target="_blank" rel="noopener noreferrer">Apache 2.0 License</a>
</p>
</div>
</div>

2
docs/_Footer.md
View File

@@ -1,3 +1,3 @@
### Want to contribute to this Wiki?
[Edit `/docs` files and send a pull request.](https://github.com/zulip/zulip-desktop/tree/master/docs)
[Edit `/docs` files and send a pull request.](https://github.com/zulip/zulip-desktop/tree/main/docs)

2
tools/fetch-rebase-pull-request
View File

@@ -12,6 +12,6 @@ fi
request_id="$1"
remote=${2:-"upstream"}
git fetch "$remote" "pull/$request_id/head"
git checkout -B "review-${request_id}" $remote/master
git checkout -B "review-${request_id}" $remote/main
git reset --hard FETCH_HEAD
git pull --rebase

4
tools/fetch-rebase-pull-request.cmd
View File

@@ -11,7 +11,7 @@ if "%~1"=="" (
echo "Error you must specify the PR number"
)
if "%~2"=="" (
if "%~2"=="" (
set remote="upstream"
) else (
set remote=%2
@@ -19,6 +19,6 @@ if "%~2"=="" (
set request_id="%1"
git fetch "%remote%" "pull/%request_id%/head"
git checkout -B "review-%request_id%" %remote%/master
git checkout -B "review-%request_id%" %remote%/main
git reset --hard FETCH_HEAD
git pull --rebase

4
tools/push-to-pull-request
View File

@@ -7,9 +7,9 @@ usage: $0 PULL_REQUEST_ID [REMOTE]
Force-push our HEAD to the given GitHub pull request branch.
Useful for a maintainer to run just before pushing to master,
Useful for a maintainer to run just before pushing to main,
after tweaking the branch and/or rebasing to latest. This causes
GitHub to see the subsequent push to master as representing a
GitHub to see the subsequent push to main as representing a
merge of the PR, rather than requiring the PR to be manually
(and to the casual observer misleadingly) closed instead.

8
zulip-electron-launcher.sh
View File

@@ -3,7 +3,7 @@
# Zulip Beta Client Launcher
# This script ensures that you have the latest version of the specified branch
# (defaults to master if none specified) and then updates or installs all your
# (defaults to main if none specified) and then updates or installs all your
# required npm modules.
# I recommend symlinking this script into your PATH.
@@ -22,7 +22,7 @@ showUsage()
envSetup()
{
defaultBranch="master"
defaultBranch="main"
startingDir=`pwd`
requirePop=0
@@ -64,12 +64,12 @@ gitCheckout()
{
git fetch $upstreamRemote
git checkout $myBranch
git rebase $upstreamRemote/master
git rebase $upstreamRemote/main
if [ $? -gt 0 ]
then
echo "Stashing uncommitted changes and doing a new git pull"
git stash && requirePop=1
git rebase $upstreamRemote/master
git rebase $upstreamRemote/main
fi
}