Commit 3fdb0d4a authored by Russell Dickenson's avatar Russell Dickenson

Merge branch 'fix/doc-user-project-source-code' into 'master'

Doc Consistency: user/project - source code

See merge request gitlab-org/gitlab!81572
parents 9360670a 726ef8f8
...@@ -124,7 +124,7 @@ Only one CODEOWNERS pattern can match per file path. ...@@ -124,7 +124,7 @@ Only one CODEOWNERS pattern can match per file path.
### Organize Code Owners by putting them into sections ### Organize Code Owners by putting them into sections
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/12137) in GitLab Premium 13.2 behind a feature flag, enabled by default. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/12137) in GitLab 13.2 behind a feature flag, enabled by default.
> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42389) in GitLab 13.4. > - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42389) in GitLab 13.4.
You can organize Code Owners by putting them into named sections. You can organize Code Owners by putting them into named sections.
...@@ -170,7 +170,7 @@ entries under **Database**. The entries defined under the sections **Documentati ...@@ -170,7 +170,7 @@ entries under **Database**. The entries defined under the sections **Documentati
### Make a Code Owners section optional ### Make a Code Owners section optional
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/232995) in GitLab Premium 13.8. > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/232995) in GitLab 13.8.
You can designate optional sections in your Code Owners file. Prepend the You can designate optional sections in your Code Owners file. Prepend the
section name with the caret `^` character to treat the entire section as optional. section name with the caret `^` character to treat the entire section as optional.
......
...@@ -25,10 +25,10 @@ GitLab supports two different modes of file locking: ...@@ -25,10 +25,10 @@ GitLab supports two different modes of file locking:
- [Exclusive file locks](#exclusive-file-locks) for binary files: done **through - [Exclusive file locks](#exclusive-file-locks) for binary files: done **through
the command line** with Git LFS and `.gitattributes`, it prevents locked the command line** with Git LFS and `.gitattributes`, it prevents locked
files from being modified on any branch. **(FREE)** files from being modified on any branch.
- [Default branch locks](#default-branch-file-and-directory-locks): done - [Default branch locks](#default-branch-file-and-directory-locks): done
**through the GitLab UI**, it prevents locked files and directories being **through the GitLab UI**, it prevents locked files and directories being
modified on the default branch. **(PREMIUM)** modified on the default branch.
## Permissions ## Permissions
...@@ -40,7 +40,7 @@ users are prevented from modifying locked files by pushing, merging, ...@@ -40,7 +40,7 @@ users are prevented from modifying locked files by pushing, merging,
or any other means, and are shown an error like: `The path '.gitignore' is or any other means, and are shown an error like: `The path '.gitignore' is
locked by Administrator`. locked by Administrator`.
## Exclusive file locks **(FREE)** ## Exclusive file locks
This process allows you to lock single files or file extensions and it is This process allows you to lock single files or file extensions and it is
done through the command line. It doesn't require GitLab paid subscriptions. done through the command line. It doesn't require GitLab paid subscriptions.
...@@ -192,7 +192,7 @@ Suggested workflow for shared projects: ...@@ -192,7 +192,7 @@ Suggested workflow for shared projects:
## Default branch file and directory locks **(PREMIUM)** ## Default branch file and directory locks **(PREMIUM)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/440) in GitLab Enterprise Edition 8.9. Available in [GitLab Premium](https://about.gitlab.com/pricing/). > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/440) in GitLab 8.9.
This process allows you to lock one file at a time through the GitLab UI and This process allows you to lock one file at a time through the GitLab UI and
requires access to [GitLab Premium](https://about.gitlab.com/pricing/) requires access to [GitLab Premium](https://about.gitlab.com/pricing/)
......
...@@ -173,8 +173,8 @@ When enabled, members who are can push to this branch can also force push. ...@@ -173,8 +173,8 @@ When enabled, members who are can push to this branch can also force push.
## Require Code Owner approval on a protected branch **(PREMIUM)** ## Require Code Owner approval on a protected branch **(PREMIUM)**
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/13251) in GitLab Premium 12.4. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/13251) in GitLab 12.4.
> - [In](https://gitlab.com/gitlab-org/gitlab/-/issues/35097) in [GitLab Premium](https://about.gitlab.com/pricing/) 13.5 and later, users and groups who can push to protected branches do not have to use a merge request to merge their feature branches. This means they can skip merge request approval rules. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/35097) in GitLab 13.5, users and groups who can push to protected branches do not have to use a merge request to merge their feature branches. This means they can skip merge request approval rules.
For a protected branch, you can require at least one approval by a [Code Owner](code_owners.md). For a protected branch, you can require at least one approval by a [Code Owner](code_owners.md).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment