diff --git a/.gitpod.yml b/.gitpod.yml
index d1a709c55ea..6ddd090f924 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -103,6 +103,8 @@ ports:
     onOpen: ignore
   - port: 9000  # object_store / minio
     onOpen: ignore
+  - port: 9122  # gitlab-shell
+    onOpen: ignore
 
 vscode:
   extensions:
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index c3e4bb0c370..665f29a0883 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -107,13 +107,6 @@ Lint/MixedRegexpCaptureTypes:
 Lint/RedundantCopDisableDirective:
   Enabled: false
 
-# Offense count: 3
-Lint/StructNewOverride:
-  Exclude:
-    - 'app/presenters/sentry_error_presenter.rb'
-    - 'app/serializers/environment_serializer.rb'
-    - 'lib/gitlab/ci/pipeline/duration.rb'
-
 # Offense count: 22
 # Cop supports --auto-correct.
 # Configuration parameters: AllowComments.
diff --git a/.rubocop_todo/lint/struct_new_override.yml b/.rubocop_todo/lint/struct_new_override.yml
new file mode 100644
index 00000000000..db6fe41903b
--- /dev/null
+++ b/.rubocop_todo/lint/struct_new_override.yml
@@ -0,0 +1,6 @@
+---
+Lint/StructNewOverride:
+  Exclude:
+    - 'app/presenters/sentry_error_presenter.rb'
+    - 'app/serializers/environment_serializer.rb'
+    - 'lib/gitlab/ci/pipeline/duration.rb'