Add latest changes from gitlab-org/security/gitlab@16-6-stable-ee

2 files changed, 1 insertions, 16 deletions

diff --git a/doc/user/project/repository/tags/index.md b/doc/user/project/repository/tags/index.md
index 1f1b8dfc9cd..765f5539244 100644
--- a/doc/user/project/repository/tags/index.md
+++ b/doc/user/project/repository/tags/index.md
@@ -97,19 +97,6 @@ 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 f1e5247efdb..f9a11a51c98 100644
--- a/doc/user/project/time_tracking.md
+++ b/doc/user/project/time_tracking.md
@@ -69,8 +69,6 @@ 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:
@@ -166,7 +164,7 @@ To view a time tracking report:
 
 ![Time tracking report](img/time_tracking_report_v15_1.png)
 
-The breakdown of spent time displayed is limited to a maximum of 100 entries.
+The breakdown of spent time is limited to a maximum of 100 entries.
 
 ## Available time units