diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 00:10:15 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 00:10:15 +0000 |
| commit | 46aea02972d6caaf34a11689e9e6ccfa9dcb538a (patch) | |
| tree | 5e4e71724bdab97d6d3f57ed25e11e0c516383fb /doc/development/architecture.md | |
| parent | 83d921d51bd5bf8bd0ecd078706d7c037fb711cb (diff) | |
| download | gitlab-ce-46aea02972d6caaf34a11689e9e6ccfa9dcb538a.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/architecture.md')
| -rw-r--r-- | doc/development/architecture.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/development/architecture.md b/doc/development/architecture.md index 67d5c02799b..9801b24fdd0 100644 --- a/doc/development/architecture.md +++ b/doc/development/architecture.md @@ -15,14 +15,14 @@ There are two software distributions of GitLab: GitLab is available under [different subscriptions](https://about.gitlab.com/pricing/). -New versions of GitLab are released from stable branches, and the `master` branch is used for +New versions of GitLab are released from stable branches, and the `main` branch is used for bleeding-edge development. For more information, visit the [GitLab Release Process](https://about.gitlab.com/handbook/engineering/releases/). Both distributions require additional components. These components are described in the [Component details](#components) section, and all have their own repositories. -New versions of each dependent component are usually tags, but staying on the `master` branch of the +New versions of each dependent component are usually tags, but staying on the `main` branch of the GitLab codebase gives you the latest stable version of those components. New versions are generally released around the same time as GitLab releases, with the exception of informal security updates deemed critical. |