VladPolskiy/gitlab-foss
1
0
Fork 0
mirror of https://gitlab.com/gitlab-org/gitlab-foss.git synced 2025-07-25 16:03:48 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Add latest changes from gitlab-org/gitlab@master

Browse Source
This commit is contained in:
GitLab Bot
2025-04-15 00:07:34 +00:00
parent f995b96e16
commit 35e1f69e79
60 changed files with 357 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/development/sec/analyzer_development_guide.md
View File

@ -367,7 +367,7 @@ Choose one of the following scenarios based on whether the major version release
Assuming the current analyzer release is `v{N}`:
1. [Configure protected tags and branches](#configure-protected-tags-and-branches).
1. When the milestone of the major release is almost complete, and there are no more changes to be merged into the `default` branch:
1. During the milestone of the major release, when there are no more changes to be merged into the `default` branch:
1. Create a `v{N}` branch from the `default` branch.
1. Create and merge a new Merge Request in the `default` branch containing only the following change to the `CHANGELOG.md` file:
@ -396,7 +396,7 @@ Assuming the current analyzer release is `v{N}`:
Using `release candidates` allows us to release **all breaking changes in a single major version bump**, which follows the [semver guidance](https://semver.org) of only making breaking changes in a major version update.
1. When the milestone of the major release is almost complete, and there are no more changes to be merged into the `default` or `v{N+1}` branches:
1. During the milestone of the major release, when there are no more changes to be merged into the `default` or `v{N+1}` branches:
1. Create a `v{N}` branch from the `default` branch.
1. Create a Merge Request in the `v{N+1}` branch to squash all the `release candidate` changelog entries into a single entry for `v{N+1}`.