Skip to content

Commit ab77a24

Browse files
update branch in CI and docs (#15631)
1 parent 21465a2 commit ab77a24

10 files changed

+43
-43
lines changed

.drone.yml

+13-13
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ steps:
277277
- test-mysql
278278
when:
279279
branch:
280-
- master
280+
- main
281281
event:
282282
- push
283283
- pull_request
@@ -294,7 +294,7 @@ steps:
294294
- generate-coverage
295295
when:
296296
branch:
297-
- master
297+
- main
298298
event:
299299
- push
300300
- pull_request
@@ -383,7 +383,7 @@ platform:
383383

384384
trigger:
385385
branch:
386-
- master
386+
- main
387387
event:
388388
- cron
389389
cron:
@@ -443,7 +443,7 @@ platform:
443443

444444
trigger:
445445
branch:
446-
- master
446+
- main
447447
event:
448448
- cron
449449
cron:
@@ -482,7 +482,7 @@ workspace:
482482

483483
trigger:
484484
branch:
485-
- master
485+
- main
486486
- "release/*"
487487
event:
488488
- push
@@ -545,7 +545,7 @@ steps:
545545
event:
546546
- push
547547

548-
- name: release-master
548+
- name: release-main
549549
image: plugins/s3:1
550550
settings:
551551
acl: public-read
@@ -554,15 +554,15 @@ steps:
554554
path_style: true
555555
source: "dist/release/*"
556556
strip_prefix: dist/release/
557-
target: /gitea/master
557+
target: /gitea/main
558558
environment:
559559
AWS_ACCESS_KEY_ID:
560560
from_secret: aws_access_key_id
561561
AWS_SECRET_ACCESS_KEY:
562562
from_secret: aws_secret_access_key
563563
when:
564564
branch:
565-
- master
565+
- main
566566
event:
567567
- push
568568

@@ -683,7 +683,7 @@ steps:
683683
from_secret: netlify_token
684684
when:
685685
branch:
686-
- master
686+
- main
687687
event:
688688
- push
689689

@@ -701,7 +701,7 @@ depends_on:
701701

702702
trigger:
703703
ref:
704-
- refs/heads/master
704+
- refs/heads/main
705705
- "refs/tags/**"
706706
event:
707707
exclude:
@@ -798,7 +798,7 @@ depends_on:
798798

799799
trigger:
800800
ref:
801-
- refs/heads/master
801+
- refs/heads/main
802802
- "refs/tags/**"
803803
event:
804804
exclude:
@@ -886,7 +886,7 @@ steps:
886886

887887
trigger:
888888
ref:
889-
- refs/heads/master
889+
- refs/heads/main
890890
- "refs/tags/**"
891891
event:
892892
exclude:
@@ -909,7 +909,7 @@ clone:
909909

910910
trigger:
911911
branch:
912-
- master
912+
- main
913913
- "release/*"
914914
event:
915915
- push

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ else
7474
ifneq ($(DRONE_BRANCH),)
7575
VERSION ?= $(subst release/v,,$(DRONE_BRANCH))
7676
else
77-
VERSION ?= master
77+
VERSION ?= main
7878
endif
7979

8080
STORED_VERSION=$(shell cat $(STORED_VERSION_FILE) 2>/dev/null)

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<p align="center">
22
<a href="https://gitea.io/">
3-
<img alt="Gitea" src="https://raw.githubusercontent.com/go-gitea/gitea/master/public/img/gitea.svg" width="220"/>
3+
<img alt="Gitea" src="https://raw.githubusercontent.com/go-gitea/gitea/main/public/img/gitea.svg" width="220"/>
44
</a>
55
</p>
66
<h1 align="center">Gitea - Git with a cup of tea</h1>
77

88
<p align="center">
99
<a href="https://drone.gitea.io/go-gitea/gitea" title="Build Status">
10-
<img src="https://drone.gitea.io/api/badges/go-gitea/gitea/status.svg?ref=refs/heads/master">
10+
<img src="https://drone.gitea.io/api/badges/go-gitea/gitea/status.svg?ref=refs/heads/main">
1111
</a>
1212
<a href="https://discord.gg/Gitea" title="Join the Discord chat at https://discord.gg/Gitea">
1313
<img src="https://img.shields.io/discord/322538954119184384.svg">
@@ -16,7 +16,7 @@
1616
<img src="https://images.microbadger.com/badges/image/gitea/gitea.svg">
1717
</a>
1818
<a href="https://codecov.io/gh/go-gitea/gitea" title="Codecov">
19-
<img src="https://codecov.io/gh/go-gitea/gitea/branch/master/graph/badge.svg">
19+
<img src="https://codecov.io/gh/go-gitea/gitea/branch/main/graph/badge.svg">
2020
</a>
2121
<a href="https://godoc.org/code.gitea.io/gitea" title="Go Report Card">
2222
<img src="https://goreportcard.com/badge/code.gitea.io/gitea">
@@ -150,7 +150,7 @@ We're [working on it](https://github.com/go-gitea/gitea/issues/1029).
150150
## License
151151

152152
This project is licensed under the MIT License.
153-
See the [LICENSE](https://github.com/go-gitea/gitea/blob/master/LICENSE) file
153+
See the [LICENSE](https://github.com/go-gitea/gitea/blob/main/LICENSE) file
154154
for the full license text.
155155

156156
## Screenshots

README_ZH.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<p align="center">
22
<a href="https://gitea.io/">
3-
<img alt="Gitea" src="https://raw.githubusercontent.com/go-gitea/gitea/master/public/img/gitea.svg" width="220"/>
3+
<img alt="Gitea" src="https://raw.githubusercontent.com/go-gitea/gitea/main/public/img/gitea.svg" width="220"/>
44
</a>
55
</p>
66
<h1 align="center">Gitea - Git with a cup of tea</h1>
77

88
<p align="center">
99
<a href="https://drone.gitea.io/go-gitea/gitea" title="Build Status">
10-
<img src="https://drone.gitea.io/api/badges/go-gitea/gitea/status.svg?ref=refs/heads/master">
10+
<img src="https://drone.gitea.io/api/badges/go-gitea/gitea/status.svg?ref=refs/heads/main">
1111
</a>
1212
<a href="https://discord.gg/Gitea" title="Join the Discord chat at https://discord.gg/Gitea">
1313
<img src="https://img.shields.io/discord/322538954119184384.svg">
@@ -16,7 +16,7 @@
1616
<img src="https://images.microbadger.com/badges/image/gitea/gitea.svg">
1717
</a>
1818
<a href="https://codecov.io/gh/go-gitea/gitea" title="Codecov">
19-
<img src="https://codecov.io/gh/go-gitea/gitea/branch/master/graph/badge.svg">
19+
<img src="https://codecov.io/gh/go-gitea/gitea/branch/main/graph/badge.svg">
2020
</a>
2121
<a href="https://godoc.org/code.gitea.io/gitea" title="Go Report Card">
2222
<img src="https://goreportcard.com/badge/code.gitea.io/gitea">
@@ -79,7 +79,7 @@ Fork -> Patch -> Push -> Pull Request
7979

8080
## 授权许可
8181

82-
本项目采用 MIT 开源授权许可证,完整的授权说明已放置在 [LICENSE](https://github.com/go-gitea/gitea/blob/master/LICENSE) 文件中。
82+
本项目采用 MIT 开源授权许可证,完整的授权说明已放置在 [LICENSE](https://github.com/go-gitea/gitea/blob/main/LICENSE) 文件中。
8383

8484
## 截图
8585

docs/content/doc/advanced/customizing-gitea.en-us.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Again `gitea help` will allow you review this variable and you can override it u
3535
`--config` option on the `gitea` binary.
3636

3737
- [Quick Cheat Sheet](https://docs.gitea.io/en-us/config-cheat-sheet/)
38-
- [Complete List](https://github.com/go-gitea/gitea/blob/master/custom/conf/app.example.ini)
38+
- [Complete List](https://github.com/go-gitea/gitea/blob/main/custom/conf/app.example.ini)
3939

4040
If the `CustomPath` folder can't be found despite checking `gitea help`, check the `GITEA_CUSTOM`
4141
environment variable; this can be used to override the default path to something else.
@@ -87,14 +87,14 @@ directory at the top of this document).
8787
Every single page of Gitea can be changed. Dynamic content is generated using [go templates](https://golang.org/pkg/html/template/),
8888
which can be modified by placing replacements below the `$GITEA_CUSTOM/templates` directory.
8989

90-
To obtain any embedded file (including templates), the [`gitea embedded` tool]({{< relref "doc/advanced/cmd-embedded.en-us.md" >}}) can be used. Alternatively, they can be found in the [`templates`](https://github.com/go-gitea/gitea/tree/master/templates) directory of Gitea source (Note: the example link is from the `master` branch. Make sure to use templates compatible with the release you are using).
90+
To obtain any embedded file (including templates), the [`gitea embedded` tool]({{< relref "doc/advanced/cmd-embedded.en-us.md" >}}) can be used. Alternatively, they can be found in the [`templates`](https://github.com/go-gitea/gitea/tree/main/templates) directory of Gitea source (Note: the example link is from the `main` branch. Make sure to use templates compatible with the release you are using).
9191

9292
Be aware that any statement contained inside `{{` and `}}` are Gitea's template syntax and
9393
shouldn't be touched without fully understanding these components.
9494

9595
### Customizing startpage / homepage
9696

97-
Copy [`home.tmpl`](https://github.com/go-gitea/gitea/blob/master/templates/home.tmpl) for your version of Gitea from `templates` to `$GITEA_CUSTOM/templates`.
97+
Copy [`home.tmpl`](https://github.com/go-gitea/gitea/blob/main/templates/home.tmpl) for your version of Gitea from `templates` to `$GITEA_CUSTOM/templates`.
9898
Edit as you wish.
9999
Dont forget to restart your gitea to apply the changes.
100100

@@ -113,7 +113,7 @@ For more information, see [Adding Legal Pages](https://docs.gitea.io/en-us/addin
113113
You can add new tabs in the same way, putting them in `extra_tabs.tmpl`.
114114
The exact HTML needed to match the style of other tabs is in the file
115115
`templates/repo/header.tmpl`
116-
([source in GitHub](https://github.com/go-gitea/gitea/blob/master/templates/repo/header.tmpl))
116+
([source in GitHub](https://github.com/go-gitea/gitea/blob/main/templates/repo/header.tmpl))
117117

118118
### Other additions to the page
119119

@@ -258,7 +258,7 @@ Then restart gitea and open a STL file on your gitea instance.
258258

259259
The `$GITEA_CUSTOM/templates/mail` folder allows changing the body of every mail of Gitea.
260260
Templates to override can be found in the
261-
[`templates/mail`](https://github.com/go-gitea/gitea/tree/master/templates/mail)
261+
[`templates/mail`](https://github.com/go-gitea/gitea/tree/main/templates/mail)
262262
directory of Gitea source.
263263
Override by making a copy of the file under `$GITEA_CUSTOM/templates/mail` using a
264264
full path structure matching source.
@@ -282,7 +282,7 @@ To add custom .gitignore, add a file with existing [.gitignore rules](https://gi
282282

283283
### Labels
284284

285-
To add a custom label set, add a file that follows the [label format](https://github.com/go-gitea/gitea/blob/master/options/label/Default) to `$GITEA_CUSTOM/options/label`
285+
To add a custom label set, add a file that follows the [label format](https://github.com/go-gitea/gitea/blob/main/options/label/Default) to `$GITEA_CUSTOM/options/label`
286286
`#hex-color label name ; label description`
287287

288288
### Licenses
@@ -293,7 +293,7 @@ To add a custom license, add a file with the license text to `$GITEA_CUSTOM/opti
293293

294294
Locales are managed via our [crowdin](https://crowdin.com/project/gitea).
295295
You can override a locale by placing an altered locale file in `$GITEA_CUSTOM/options/locale`.
296-
Gitea's default locale files can be found in the [`options/locale`](https://github.com/go-gitea/gitea/tree/master/options/locale) source folder and these should be used as examples for your changes.
296+
Gitea's default locale files can be found in the [`options/locale`](https://github.com/go-gitea/gitea/tree/main/options/locale) source folder and these should be used as examples for your changes.
297297

298298
To add a completely new locale, as well as placing the file in the above location, you will need to add the new lang and name to the `[i18n]` section in your `app.ini`. Keep in mind that Gitea will use those settings as **overrides**, so if you want to keep the other languages as well you will need to copy/paste the default values and add your own to them.
299299

docs/content/doc/developers/hacking-on-gitea.en-us.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ from within the `$GOPATH`, hence the `go get` approach is no longer recommended.
8686

8787
## Forking Gitea
8888

89-
Download the master Gitea source code as above. Then, fork the
89+
Download the main Gitea source code as above. Then, fork the
9090
[Gitea repository](https://github.com/go-gitea/gitea) on GitHub,
9191
and either switch the git remote origin for your fork or add your fork as another remote:
9292

@@ -123,7 +123,7 @@ TAGS="bindata sqlite sqlite_unlock_notify" make build
123123

124124
The `build` target will execute both `frontend` and `backend` sub-targets. If the `bindata` tag is present, the frontend files will be compiled into the binary. It is recommended to leave out the tag when doing frontend development so that changes will be reflected.
125125

126-
See `make help` for all available `make` targets. Also see [`.drone.yml`](https://github.com/go-gitea/gitea/blob/master/.drone.yml) to see how our continuous integration works.
126+
See `make help` for all available `make` targets. Also see [`.drone.yml`](https://github.com/go-gitea/gitea/blob/main/.drone.yml) to see how our continuous integration works.
127127

128128
## Building continuously
129129

@@ -276,7 +276,7 @@ require `git lfs` to be installed. Other database tests are available but
276276
may need adjustment to the local environment.
277277

278278
Look at
279-
[`integrations/README.md`](https://github.com/go-gitea/gitea/blob/master/integrations/README.md)
279+
[`integrations/README.md`](https://github.com/go-gitea/gitea/blob/main/integrations/README.md)
280280
for more information and how to run a single test.
281281

282282
Our continuous integration will test the code passes its unit tests and that
@@ -304,19 +304,19 @@ be cleaned up.
304304

305305
A `launch.json` and `tasks.json` are provided within `contrib/ide/vscode` for
306306
Visual Studio Code. Look at
307-
[`contrib/ide/README.md`](https://github.com/go-gitea/gitea/blob/master/contrib/ide/README.md)
307+
[`contrib/ide/README.md`](https://github.com/go-gitea/gitea/blob/main/contrib/ide/README.md)
308308
for more information.
309309

310310
## Submitting PRs
311311

312312
Once you're happy with your changes, push them up and open a pull request. It
313313
is recommended that you allow Gitea Managers and Owners to modify your PR
314-
branches as we will need to update it to master before merging and/or may be
314+
branches as we will need to update it to main before merging and/or may be
315315
able to help fix issues directly.
316316

317317
Any PR requires two approvals from the Gitea maintainers and needs to pass the
318318
continous integration. Take a look at our
319-
[`CONTRIBUTING.md`](https://github.com/go-gitea/gitea/blob/master/CONTRIBUTING.md)
319+
[`CONTRIBUTING.md`](https://github.com/go-gitea/gitea/blob/main/CONTRIBUTING.md)
320320
document.
321321

322322
If you need more help pop on to [Discord](https://discord.gg/gitea) #Develop

docs/content/doc/developers/migrations.en-us.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ repository data from other git host platforms to Gitea or, in the future, migrat
2020
git host platforms.
2121
Currently, migrations from Github, Gitlab, and other Gitea instances are implemented.
2222

23-
First of all, Gitea defines some standard objects in packages [modules/migrations/base](https://github.com/go-gitea/gitea/tree/master/modules/migrations/base).
23+
First of all, Gitea defines some standard objects in packages [modules/migrations/base](https://github.com/go-gitea/gitea/tree/main/modules/migrations/base).
2424
They are `Repository`, `Milestone`, `Release`, `ReleaseAsset`, `Label`, `Issue`, `Comment`, `PullRequest`, `Reaction`, `Review`, `ReviewComment`.
2525

2626
## Downloader Interfaces
@@ -31,11 +31,11 @@ To migrate from a new git host platform, there are two steps to be updated.
3131
- You should implement a `DownloaderFactory` which will be used to detect if the URL matches and create the above `Downloader`.
3232
- You'll need to register the `DownloaderFactory` via `RegisterDownloaderFactory` on `init()`.
3333

34-
You can find these interfaces in [downloader.go](https://github.com/go-gitea/gitea/blob/master/modules/migrations/base/downloader.go).
34+
You can find these interfaces in [downloader.go](https://github.com/go-gitea/gitea/blob/main/modules/migrations/base/downloader.go).
3535

3636
## Uploader Interface
3737

3838
Currently, only a `GiteaLocalUploader` is implemented, so we only save downloaded
3939
data via this `Uploader` to the local Gitea instance. Other uploaders are not supported at this time.
4040

41-
You can find these interfaces in [uploader.go](https://github.com/go-gitea/gitea/blob/master/modules/migrations/base/uploader.go).
41+
You can find these interfaces in [uploader.go](https://github.com/go-gitea/gitea/blob/main/modules/migrations/base/uploader.go).

docs/content/doc/installation/from-source.en-us.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ git clone https://github.com/go-gitea/gitea
5454
no longer necessary.)
5555

5656
Decide which version of Gitea to build and install. Currently, there are
57-
multiple options to choose from. The `master` branch represents the current
58-
development version. To build with master, skip to the [build section](#build).
57+
multiple options to choose from. The `main` branch represents the current
58+
development version. To build with main, skip to the [build section](#build).
5959

6060
To work with tagged releases, the following commands can be used:
6161

@@ -89,7 +89,7 @@ To build from source, the following programs must be present on the system:
8989
- `node` {{< min-node-version >}} or higher with `npm`, see [here](https://nodejs.org/en/download/)
9090
- `make`, see <a href='{{< relref "doc/developers/hacking-on-gitea.en-us.md" >}}#installing-make'>here</a>
9191

92-
Various [make tasks](https://github.com/go-gitea/gitea/blob/master/Makefile)
92+
Various [make tasks](https://github.com/go-gitea/gitea/blob/main/Makefile)
9393
are provided to keep the build process as simple as possible.
9494

9595
Depending on requirements, the following build tags can be included.

docs/content/doc/installation/with-docker-rootless.en-us.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ docker-compose up -d
266266

267267
## Managing Deployments With Environment Variables
268268

269-
In addition to the environment variables above, any settings in `app.ini` can be set or overridden with an environment variable of the form: `GITEA__SECTION_NAME__KEY_NAME`. These settings are applied each time the docker container starts. Full information [here](https://github.com/go-gitea/gitea/tree/master/contrib/environment-to-ini).
269+
In addition to the environment variables above, any settings in `app.ini` can be set or overridden with an environment variable of the form: `GITEA__SECTION_NAME__KEY_NAME`. These settings are applied each time the docker container starts. Full information [here](https://github.com/go-gitea/gitea/tree/main/contrib/environment-to-ini).
270270

271271
These environment variables can be passed to the docker container in `docker-compose.yml`. The following example will enable an smtp mail server if the required env variables `GITEA__mailer__FROM`, `GITEA__mailer__HOST`, `GITEA__mailer__PASSWD` are set on the host or in a `.env` file in the same directory as `docker-compose.yml`:
272272

docs/content/doc/upgrade/from-gogs.en-us.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ See [#4286](https://github.com/go-gitea/gitea/issues/4286).
9696

9797
## Add Gitea to startup on Unix
9898

99-
Update the appropriate file from [gitea/contrib](https://github.com/go-gitea/gitea/tree/master/contrib)
99+
Update the appropriate file from [gitea/contrib](https://github.com/go-gitea/gitea/tree/main/contrib)
100100
with the right environment variables.
101101

102102
For distros with systemd:

0 commit comments

Comments
 (0)