From fd42606aae6ecaa16650ad25afe0551df6b52015 Mon Sep 17 00:00:00 2001 From: Mateusz Mandera Date: Fri, 7 Feb 2025 15:56:53 +0800 Subject: [PATCH] Update stale "master" branch references to "main". We renamed master->main a long time ago. --- README.md | 2 +- UPGRADING.md | 4 ++-- kubernetes/chart/zulip/values-local.yaml.example | 2 +- kubernetes/chart/zulip/values.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 80e7b1b..bbcf4d7 100644 --- a/README.md +++ b/README.md @@ -427,5 +427,5 @@ make a high-quality Docker image for Zulip possible. [install-normal]: https://zulip.readthedocs.io/en/latest/production/install.html#installer-options [outgoing-email]: https://zulip.readthedocs.io/en/latest/production/email.html [server-settings]: https://zulip.readthedocs.io/en/latest/production/settings.html -[prod-settings-template]: https://github.com/zulip/zulip/blob/master/zproject/prod_settings_template.py +[prod-settings-template]: https://github.com/zulip/zulip/blob/main/zproject/prod_settings_template.py [create-organization]: http://zulip.readthedocs.io/en/latest/production/install.html#step-3-create-a-zulip-organization-and-log-in diff --git a/UPGRADING.md b/UPGRADING.md index f8c5a6a..b19103b 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -85,11 +85,11 @@ docker-compose exec -u zulip zulip cat /home/zulip/deployments/current/version.p args: # Change these if you want to build zulip from a different repo/branch ZULIP_GIT_URL: https://github.com/zulip/zulip.git - ZULIP_GIT_REF: master + ZULIP_GIT_REF: main ``` You can set `ZULIP_GIT_URL` to any clone of the zulip/zulip git repository, - and `ZULIP_GIT_REF` to be any ref name in that repository (e.g. `master` or + and `ZULIP_GIT_REF` to be any ref name in that repository (e.g. `main` or `1.9.0` or `445932cc8613c77ced023125248c8b966b3b7528`). 2. Run `docker-compose build zulip` to build a Zulip Docker image from the diff --git a/kubernetes/chart/zulip/values-local.yaml.example b/kubernetes/chart/zulip/values-local.yaml.example index 2fb3cb4..b311fb4 100644 --- a/kubernetes/chart/zulip/values-local.yaml.example +++ b/kubernetes/chart/zulip/values-local.yaml.example @@ -7,7 +7,7 @@ zulip: # password: set-secure-password # Add any other environment variables you want to configure here. - # based on; https://github.com/zulip/docker-zulip/blob/master/docker-compose.yml#L63 + # based on; https://github.com/zulip/docker-zulip/blob/main/docker-compose.yml#L63 # these values will be merged with db secrets and hosts/ports environment: # Domain diff --git a/kubernetes/chart/zulip/values.yaml b/kubernetes/chart/zulip/values.yaml index 8c2eaa0..62b61ac 100644 --- a/kubernetes/chart/zulip/values.yaml +++ b/kubernetes/chart/zulip/values.yaml @@ -125,7 +125,7 @@ affinity: {} zulip: ## Environment variables based on - ## https://github.com/zulip/docker-zulip/blob/master/docker-compose.yml#L63 + ## https://github.com/zulip/docker-zulip/blob/main/docker-compose.yml#L63 environment: ## Disable the default Zulip requirement of HTTPS. HTTPS and ## certificates are managed by the Kubernetes cluster, so by