From 7f35b02e86cd3d2e8b4a81c5c3a8483ff6973c5a Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 14 Nov 2022 21:10:12 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .rubocop_todo/api/ensure_string_detail.yml | 5 +++++
 .rubocop_todo/layout/line_length.yml       | 2 --
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 .rubocop_todo/api/ensure_string_detail.yml

(limited to '.rubocop_todo')

diff --git a/.rubocop_todo/api/ensure_string_detail.yml b/.rubocop_todo/api/ensure_string_detail.yml
new file mode 100644
index 00000000000..feac99aa569
--- /dev/null
+++ b/.rubocop_todo/api/ensure_string_detail.yml
@@ -0,0 +1,5 @@
+---
+API/EnsureStringDetail:
+  Details: grace period
+  Exclude:
+    - 'ee/lib/api/analytics/group_activity_analytics.rb'
diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index 9bc4734ed44..a53c450fee3 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -2943,7 +2943,6 @@ Layout/LineLength:
     - 'lib/api/entities/issue_basic.rb'
     - 'lib/api/entities/merge_request.rb'
     - 'lib/api/entities/namespace.rb'
-    - 'lib/api/entities/package.rb'
     - 'lib/api/entities/project.rb'
     - 'lib/api/entities/user.rb'
     - 'lib/api/environments.rb'
@@ -2955,7 +2954,6 @@ Layout/LineLength:
     - 'lib/api/group_clusters.rb'
     - 'lib/api/group_import.rb'
     - 'lib/api/group_labels.rb'
-    - 'lib/api/group_packages.rb'
     - 'lib/api/group_variables.rb'
     - 'lib/api/groups.rb'
     - 'lib/api/helm_packages.rb'
-- 
cgit v1.2.3