diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-13 01:59:38 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-13 01:59:38 +0300 |
commit | 734bfe3a2e8b86c3e049f6f13d380b3d30e4e359 (patch) | |
tree | a0599c2a6efd4466ba7f48471def5791d2682e53 /doc/user | |
parent | 27e1dab1ed98c46c91b85e8c5dd1cefd62c0cb96 (diff) |
Add latest changes from gitlab-org/security/gitlab@16-6-stable-ee
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/project/repository/tags/index.md | 13 | ||||
-rw-r--r-- | doc/user/project/time_tracking.md | 4 |
2 files changed, 16 insertions, 1 deletions
diff --git a/doc/user/project/repository/tags/index.md b/doc/user/project/repository/tags/index.md index 765f5539244..1f1b8dfc9cd 100644 --- a/doc/user/project/repository/tags/index.md +++ b/doc/user/project/repository/tags/index.md @@ -97,6 +97,19 @@ To create a tag from the GitLab UI: create a lightweight tag. 1. Select **Create tag**. +## Name your tag + +Git enforces [tag name rules](https://git-scm.com/docs/git-check-ref-format) +to help ensure tag names remain compatible with other tools. GitLab +adds extra requirements for tag names, and provides benefits for well-structured tag names. + +GitLab enforces these additional rules on all tags: + +- No spaces are allowed in tag names. +- Tag names starting with 40 or 64 hexadecimal characters are prohibited, because they are similar to Git commit hashes. +- Tag names cannot start with `-`, `refs/heads`, `refs/tags`, or `refs/remotes` +- Tag names are case-sensitive. + ## Prevent tag deletion **(PREMIUM ALL)** To prevent users from removing a tag with `git push`, create a [push rule](../push_rules.md). diff --git a/doc/user/project/time_tracking.md b/doc/user/project/time_tracking.md index f9a11a51c98..f1e5247efdb 100644 --- a/doc/user/project/time_tracking.md +++ b/doc/user/project/time_tracking.md @@ -69,6 +69,8 @@ As you work, you can log the time you've spent. Every new time spent entry is added to the current total time spent for the issue or the merge request. +The total amount of time spent on an issue or merge request cannot exceed a year. + ### Add time spent Prerequisites: @@ -164,7 +166,7 @@ To view a time tracking report: ![Time tracking report](img/time_tracking_report_v15_1.png) -The breakdown of spent time is limited to a maximum of 100 entries. +The breakdown of spent time displayed is limited to a maximum of 100 entries. ## Available time units |