diff --git a/Gemfile b/Gemfile
index f0ba023c8e0b6037dd1b26a0735895336858e174..0e8209ec0c84edc9beb6d0818d9aff9803f2b683 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,7 @@ end
 
 extend ignore_feature_category
 
-gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', require: false # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', require: false, feature_category: :shared
 
 # NOTE: When incrementing the major or minor version here, also increment activerecord_version
 # in vendor/gems/attr_encrypted/attr_encrypted.gemspec until we resolve
@@ -35,22 +35,22 @@ else
   gem 'rails', '~> 7.0.8.7', feature_category: :shared
 end
 
-gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab', feature_category: :shared
 
-gem 'bootsnap', '~> 1.18.3', require: false # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'bootsnap', '~> 1.18.3', require: false, feature_category: :shared
 
 # Avoid the precompiled native gems because Omnibus needs to build this to ensure
 # LD_LIBRARY_PATH is correct: https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7730
 gem 'ffi', '~> 1.17', force_ruby_platform: true, feature_category: :shared
 
-gem 'openssl', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'ipaddr', '~> 1.2.5' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'openssl', '~> 3.0', feature_category: :shared
+gem 'ipaddr', '~> 1.2.5', feature_category: :shared
 
-gem 'gitlab-safe_request_store', path: 'gems/gitlab-safe_request_store' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'gitlab-safe_request_store', path: 'gems/gitlab-safe_request_store', feature_category: :shared
 
 # GitLab Monorepo Gems
 group :monorepo do
-  gem 'gitlab-utils', path: 'gems/gitlab-utils' # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'gitlab-utils', path: 'gems/gitlab-utils', feature_category: :shared
 end
 
 gem 'gitlab-backup-cli', path: 'gems/gitlab-backup-cli', require: 'gitlab/backup/cli', feature_category: :backup_restore
@@ -58,76 +58,80 @@ gem 'gitlab-backup-cli', path: 'gems/gitlab-backup-cli', require: 'gitlab/backup
 gem 'gitlab-secret_detection', path: 'gems/gitlab-secret_detection', feature_category: :secret_detection
 
 # Responders respond_to and respond_with
-gem 'responders', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'responders', '~> 3.0', feature_category: :shared
 
-gem 'sprockets', '~> 3.7.0' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'sprockets-rails', '~>  3.5.1' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'sprockets', '~> 3.7.0', feature_category: :shared
+gem 'sprockets-rails', '~>  3.5.1', feature_category: :shared
 
-gem 'view_component', '~> 3.21.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'view_component', '~> 3.21.0', feature_category: :shared
 
 # Supported DBs
 gem 'pg', '~> 1.5.6', feature_category: :database
 
 gem 'neighbor', '~> 0.3.2', feature_category: :duo_chat
 
-gem 'rugged', '~> 1.6' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'rugged', '~> 1.6', feature_category: :gitaly
 
 gem 'faraday', '~> 2', feature_category: :shared
 gem 'faraday-retry', '~> 2', feature_category: :shared
 # Logger is a dependency of Faraday, but Logger 1.6.0 does not work with Chef.
-gem 'logger', '~> 1.5.3' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'logger', '~> 1.5.3', feature_category: :shared
 
-gem 'marginalia', '~> 1.11.1' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'marginalia', '~> 1.11.1', feature_category: :database
 
 # Authorization
-gem 'declarative_policy', '~> 1.1.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'declarative_policy', '~> 1.1.0', feature_category: :shared
 
 # For source code paths mapping
 gem 'coverband', '6.1.4', require: false, feature_category: :shared
 
 # Authentication libraries
 gem 'devise', '~> 4.9.3', feature_category: :system_access
-gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'bcrypt', '~> 3.1', '>= 3.1.14' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable',
+  feature_category: :system_access
+gem 'bcrypt', '~> 3.1', '>= 3.1.14', feature_category: :system_access
 gem 'doorkeeper', '~> 5.8', '>= 5.8.1', feature_category: :system_access
 gem 'doorkeeper-openid_connect', '~> 1.8.10', feature_category: :system_access
 gem 'doorkeeper-device_authorization_grant', '~> 1.0.0', feature_category: :system_access
-gem 'rexml', '~> 3.3.2' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'rexml', '~> 3.3.2', feature_category: :shared
 gem 'ruby-saml', '~> 1.17.0', feature_category: :system_access
-gem 'omniauth', '~> 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'omniauth-auth0', '~> 3.1' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'omniauth-azure-activedirectory-v2', '~> 2.0' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'omniauth-alicloud', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'omniauth-github', '2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'omniauth-google-oauth2', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'omniauth-oauth2-generic', '~> 0.2.2' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'omniauth', '~> 2.1.0', feature_category: :system_access
+gem 'omniauth-auth0', '~> 3.1', feature_category: :system_access
+gem 'omniauth-azure-activedirectory-v2', '~> 2.0', feature_category: :system_access
+gem 'omniauth-alicloud', '~> 3.0.0', feature_category: :system_access
+gem 'omniauth-github', '2.0.1', feature_category: :system_access
+# See vendor/gems/omniauth-gitlab/README.md
+gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab', feature_category: :system_access
+gem 'omniauth-google-oauth2', '~> 1.1', feature_category: :system_access
+gem 'omniauth-oauth2-generic', '~> 0.2.2', feature_category: :system_access
 gem 'omniauth-saml', '~> 2.2.1', feature_category: :system_access
-gem 'omniauth-shibboleth-redux', '~> 2.0', require: 'omniauth-shibboleth' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'omniauth_openid_connect', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'omniauth-shibboleth-redux', '~> 2.0', require: 'omniauth-shibboleth', feature_category: :system_access
+# See vendor/gems/omniauth_crowd/README.md
+gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd', feature_category: :system_access
+gem 'omniauth_openid_connect', '~> 0.8.0', feature_category: :system_access
 # Locked until Ruby 3.0 upgrade since upgrading will pull in an updated net-smtp gem.
 # See https://docs.gitlab.com/ee/development/emails.html#rationale.
-gem 'openid_connect', '~> 2.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'omniauth-atlassian-oauth2', '~> 0.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'rack-oauth2', '~> 2.2.1' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'jwt', '~> 2.9.3' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'openid_connect', '~> 2.3.0', feature_category: :system_access
+# See gem README.md
+gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce', feature_category: :system_access
+gem 'omniauth-atlassian-oauth2', '~> 0.2.0', feature_category: :system_access
+gem 'rack-oauth2', '~> 2.2.1', feature_category: :system_access
+gem 'jwt', '~> 2.9.3', feature_category: :system_access
 
 # Kerberos authentication. EE-only
-gem 'gssapi', '~> 1.3.1', group: :kerberos # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'gssapi', '~> 1.3.1', group: :kerberos, feature_category: :system_access
+gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos, feature_category: :system_access
 
 # Spam and anti-bot protection
-gem 'recaptcha', '~> 5.12', require: 'recaptcha/rails' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'akismet', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'invisible_captcha', '~> 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'recaptcha', '~> 5.12', require: 'recaptcha/rails', feature_category: :insider_threat
+gem 'akismet', '~> 3.0', feature_category: :insider_threat
+gem 'invisible_captcha', '~> 2.1.0', feature_category: :insider_threat
 
 # Two-factor authentication
-gem 'devise-two-factor', '~> 4.1.1' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'devise-two-factor', '~> 4.1.1', feature_category: :system_access
 gem 'rqrcode', '~> 2.2', feature_category: :system_access
 
-gem 'attr_encrypted', '~> 3.2.4', path: 'vendor/gems/attr_encrypted' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'attr_encrypted', '~> 3.2.4', path: 'vendor/gems/attr_encrypted', feature_category: :shared
 
 # GitLab Pages
 gem 'validates_hostname', '~> 1.0.13', feature_category: :pages
@@ -136,10 +140,10 @@ gem 'rubyzip', '~> 2.3.2', require: 'zip', feature_category: :pages
 gem 'acme-client', '~> 2.0.19', feature_category: :pages
 
 # Browser detection
-gem 'browser', '~> 5.3.1' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'browser', '~> 5.3.1', feature_category: :shared
 
 # OS detection for usage ping
-gem 'ohai', '~> 18.1' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'ohai', '~> 18.1', feature_category: :product_analytics
 
 # GPG
 gem 'gpgme', '~> 2.0.24', feature_category: :source_code_management
@@ -147,8 +151,8 @@ gem 'gpgme', '~> 2.0.24', feature_category: :source_code_management
 # LDAP Auth
 # GitLab fork with several improvements to original library. For full list of changes
 # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
-gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'net-ldap', '~> 0.17.1' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap', feature_category: :system_access
+gem 'net-ldap', '~> 0.17.1', feature_category: :system_access
 
 # API
 gem 'grape', '~> 2.0.0', feature_category: :api
@@ -156,7 +160,7 @@ gem 'grape-entity', '~> 1.0.1', feature_category: :api
 gem 'grape-swagger', '~> 2.1.0', group: [:development, :test], feature_category: :api
 gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test], feature_category: :api
 gem 'grape-path-helpers', '~> 2.0.1', feature_category: :api
-gem 'rack-cors', '~> 2.0.1', require: 'rack/cors' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared
 
 # GraphQL API
 gem 'graphql', '~> 2.4.1', feature_category: :api
@@ -175,68 +179,68 @@ gem 'gitlab-duo-workflow-service-client', '~> 0.1',
   feature_category: :duo_workflow
 
 # Generate Fake data
-gem 'ffaker', '~> 2.23' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'ffaker', '~> 2.23', feature_category: :shared
 
-gem 'hashie', '~> 5.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'hashie', '~> 5.0.0', feature_category: :shared
 
 # Pagination
-gem 'kaminari', '~> 1.2.2' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'kaminari', '~> 1.2.2', feature_category: :shared
 
 # HAML
-gem 'hamlit', '~> 2.15.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'hamlit', '~> 2.15.0', feature_category: :shared
 
 # Files attachments
-gem 'carrierwave', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'mini_magick', '~> 4.12' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'carrierwave', '~> 1.3', feature_category: :shared
+gem 'mini_magick', '~> 4.12', feature_category: :shared
 
 # for backups
 gem 'fog-aws', '~> 3.26', feature_category: :shared
 # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
 # Also see config/initializers/fog_core_patch.rb.
-gem 'fog-core', '= 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'fog-google', '~> 1.24.1', require: 'fog/google' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'fog-local', '~> 0.8' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'fog-core', '= 2.1.0', feature_category: :shared
+gem 'fog-google', '~> 1.24.1', require: 'fog/google', feature_category: :shared
+gem 'fog-local', '~> 0.8', feature_category: :shared
 # NOTE:
 # the fog-aliyun gem since v0.4 pulls in aliyun-sdk transitively, which monkey-patches
 # the rest-client gem to drop the Content-Length header field for chunked transfers,
 # which may have knock-on effects on other features using `RestClient`.
 # We may want to update this dependency if this is ever addressed upstream, e.g. via
 # https://github.com/aliyun/aliyun-oss-ruby-sdk/pull/93
-gem 'fog-aliyun', '~> 0.4' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'fog-aliyun', '~> 0.4', feature_category: :shared
 gem 'gitlab-fog-azure-rm', '~> 2.2.0', require: 'fog/azurerm', feature_category: :shared
 
 # for Google storage
 
 # Need this specific version of google-apis-storage_v1 so that fog-google will utilize the updated list_objects with
 # match_glob support in google-apis-core 0.11.1. Because of this we also have to bump google-cloud-storage to 1.45.0.
-gem 'google-apis-storage_v1', '~> 0.29' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'google-cloud-storage', '~> 1.45.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'google-apis-storage_v1', '~> 0.29', feature_category: :shared
+gem 'google-cloud-storage', '~> 1.45.0', feature_category: :shared
 # We need >= 0.11.1 because that's when match_glob support is added to list_objects
-gem 'google-apis-core', '~> 0.11.0', '>= 0.11.1' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'google-apis-compute_v1', '~> 0.57.0' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'google-apis-container_v1', '~> 0.43.0' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'google-apis-container_v1beta1', '~> 0.43.0' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'google-apis-cloudbilling_v1', '~> 0.21.0' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'google-apis-cloudresourcemanager_v1', '~> 0.31.0' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'google-apis-iam_v1', '~> 0.36.0' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'google-apis-serviceusage_v1', '~> 0.28.0' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'google-apis-androidpublisher_v3', '~> 0.34.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'google-apis-core', '~> 0.11.0', '>= 0.11.1', feature_category: :shared
+gem 'google-apis-compute_v1', '~> 0.57.0', feature_category: :shared
+gem 'google-apis-container_v1', '~> 0.43.0', feature_category: :shared
+gem 'google-apis-container_v1beta1', '~> 0.43.0', feature_category: :shared
+gem 'google-apis-cloudbilling_v1', '~> 0.21.0', feature_category: :shared
+gem 'google-apis-cloudresourcemanager_v1', '~> 0.31.0', feature_category: :shared
+gem 'google-apis-iam_v1', '~> 0.36.0', feature_category: :shared
+gem 'google-apis-serviceusage_v1', '~> 0.28.0', feature_category: :shared
+gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0', feature_category: :shared
+gem 'google-apis-androidpublisher_v3', '~> 0.34.0', feature_category: :shared
 
 gem 'googleauth', '~> 1.8.1', feature_category: :shared
 gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared
 gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared
 
 # Seed data
-gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'seed-fu', '~> 2.3.7', feature_category: :shared
 
 # Search
 gem 'elasticsearch-model', '~> 7.2', feature_category: :global_search
 gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation', feature_category: :global_search
 gem 'elasticsearch-api', '7.17.11', feature_category: :global_search
-gem 'aws-sdk-core', '~> 3.214.0' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'aws-sdk-s3', '~> 1.176.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'aws-sdk-core', '~> 3.214.0', feature_category: :global_search
+gem 'aws-sdk-cloudformation', '~> 1', feature_category: :global_search
+gem 'aws-sdk-s3', '~> 1.176.0', feature_category: :global_search
 gem 'faraday-typhoeus', '~> 1.1', feature_category: :global_search
 gem 'faraday_middleware-aws-sigv4', '~> 1.0.1', feature_category: :global_search
 # Used with Elasticsearch to support http keep-alive connections
@@ -267,24 +271,24 @@ gem 'tanuki_emoji', '~> 0.13', feature_category: :markdown
 gem 'unicode-emoji', '~> 4.0', feature_category: :markdown
 
 # Calendar rendering
-gem 'icalendar', '~> 2.10.1', feature_category: :system_access
+gem 'icalendar', '~> 2.10.1', feature_category: :team_planning
 
 # Diffs
-gem 'diffy', '~> 3.4' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'diffy', '~> 3.4', feature_category: :shared
 gem 'diff_match_patch', '~> 0.1.0', path: 'vendor/gems/diff_match_patch', feature_category: :team_planning
 
 # Application server
-gem 'rack', '~> 2.2.9' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'rack', '~> 2.2.9', feature_category: :shared
 # https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually
-gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base', feature_category: :shared
 
 group :puma do
   gem 'puma', '= 6.5.0', require: false, feature_category: :shared
-  gem 'sd_notify', '~> 0.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'sd_notify', '~> 0.1.0', require: false, feature_category: :shared
 end
 
 # State machine
-gem 'state_machines-activerecord', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared
 
 # Background jobs
 gem 'sidekiq', path: 'vendor/gems/sidekiq-7.2.4', require: 'sidekiq', feature_category: :scalability
@@ -298,34 +302,34 @@ gem 'gitlab-sidekiq-fetcher',
 gem 'fugit', '~> 1.11.1', feature_category: :continuous_integration
 
 # HTTP requests
-gem 'httparty', '~> 0.21.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'httparty', '~> 0.21.0', feature_category: :shared
 
 # Colored output to console
-gem 'rainbow', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'rainbow', '~> 3.0', feature_category: :shared
 
 # Progress bar
-gem 'ruby-progressbar', '~> 1.10' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'ruby-progressbar', '~> 1.10', feature_category: :shared
 
 # Linear-time regex library for untrusted regular expressions
-gem 're2', '2.7.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 're2', '2.7.0', feature_category: :shared
 
 # Misc
 
 gem 'semver_dialects', '~> 3.0', feature_category: :software_composition_analysis
-gem 'version_sorter', '~> 2.3' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'csv_builder', path: 'gems/csv_builder' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'version_sorter', '~> 2.3', feature_category: :shared
+gem 'csv_builder', path: 'gems/csv_builder', feature_category: :shared
 
 # Export Ruby Regex to Javascript
-gem 'js_regex', '~> 3.8' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'js_regex', '~> 3.8', feature_category: :shared
 
 # User agent parsing
-gem 'device_detector' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'device_detector', feature_category: :shared
 
 # Redis
 gem 'redis-namespace', '~> 1.11.0', feature_category: :redis
 gem 'redis', '~> 5.3.0', feature_category: :redis
 gem 'redis-clustering', '~> 5.3.0', feature_category: :redis
-gem 'connection_pool', '~> 2.4' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'connection_pool', '~> 2.4', feature_category: :shared
 
 # Redis session store
 gem 'redis-actionpack', '~> 5.5.0', feature_category: :redis
@@ -344,49 +348,49 @@ gem 'slack-messenger', '~> 2.3.5', feature_category: :integrations
 gem 'ruby-fogbugz', '~> 0.3.0', feature_category: :importers
 
 # Kubernetes integration
-gem 'kubeclient', '~> 4.11.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'kubeclient', '~> 4.11.0', feature_category: :shared
 
 # AI
-gem 'ruby-openai', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'circuitbox', '2.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'ruby-openai', '~> 3.7', feature_category: :ai_abstraction_layer
+gem 'circuitbox', '2.0.0', feature_category: :ai_abstraction_layer
 
 # Sanitize user input
-gem 'sanitize', '~> 6.0.2' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'babosa', '~> 2.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'sanitize', '~> 6.0.2', feature_category: :shared
+gem 'babosa', '~> 2.0', feature_category: :shared
 
 # Sanitizes SVG input
-gem 'loofah', '~> 2.22.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'loofah', '~> 2.22.0', feature_category: :shared
 
 # Used to provide license templates
-gem 'licensee', '~> 9.16' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'licensee', '~> 9.16', feature_category: :shared
 
 # Detect and convert string character encoding
 gem 'charlock_holmes', '~> 0.7.9', feature_category: :shared
 
 # Detect mime content type from content
-gem 'ruby-magic', '~> 0.6' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'ruby-magic', '~> 0.6', feature_category: :shared
 
 # Faster blank
-gem 'fast_blank', '~> 1.0.1' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'fast_blank', '~> 1.0.1', feature_category: :shared
 
 # Parse time & duration
-gem 'gitlab-chronic', '~> 0.10.5' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'gitlab_chronic_duration', '~> 0.12' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'gitlab-chronic', '~> 0.10.5', feature_category: :shared
+gem 'gitlab_chronic_duration', '~> 0.12', feature_category: :shared
 
-gem 'rack-proxy', '~> 0.7.7' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'rack-proxy', '~> 0.7.7', feature_category: :shared
 
 gem 'cssbundling-rails', '1.4.1', feature_category: :shared
-gem 'terser', '1.0.2' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'terser', '1.0.2', feature_category: :shared
 
-gem 'click_house-client', path: 'gems/click_house-client', require: 'click_house/client' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'addressable', '~> 2.8' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'gon', '~> 6.4.0' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'request_store', '~> 1.5.1' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'base32', '~> 0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'click_house-client', path: 'gems/click_house-client', require: 'click_house/client', feature_category: :database
+gem 'addressable', '~> 2.8', feature_category: :shared
+gem 'gon', '~> 6.4.0', feature_category: :shared
+gem 'request_store', '~> 1.5.1', feature_category: :shared
+gem 'base32', '~> 0.3.0', feature_category: :shared
 gem 'gitlab-license', '~> 2.6', feature_category: :shared
 
 # Protect against bruteforcing
-gem 'rack-attack', '~> 6.7.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'rack-attack', '~> 6.7.0', feature_category: :shared
 
 # Sentry integration
 gem 'sentry-ruby', '~> 5.22.0', feature_category: :observability
@@ -397,12 +401,12 @@ gem 'sentry-sidekiq', '~> 5.22.0', feature_category: :observability
 #
 gem 'pg_query', '~> 6.0.0', feature_category: :database
 
-gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'gitlab-http', path: 'gems/gitlab-http' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation', feature_category: :shared
+gem 'gitlab-http', path: 'gems/gitlab-http', feature_category: :shared
 
 gem 'premailer-rails', '~> 1.12.0', feature_category: :notifications
 gem 'gitlab-labkit', '~> 0.37.0', feature_category: :shared
-gem 'thrift', '>= 0.16.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'thrift', '>= 0.16.0', feature_category: :shared
 
 # I18n
 gem 'rails-i18n', '~> 7.0', '>= 7.0.9', feature_category: :internationalization
@@ -412,26 +416,27 @@ gem 'gettext', '~> 3.4', '>= 3.4.9',
   group: [:development, :test],
   feature_category: :internationalization
 
-gem 'batch-loader', '~> 2.0.5' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'batch-loader', '~> 2.0.5', feature_category: :shared
 
 gem 'tty-prompt', '~> 0.23', require: false, feature_category: :shared
 
 # Perf bar
-gem 'peek', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'peek', '~> 1.1', feature_category: :shared
 
 # Google Cloud Profiler support
-gem 'cloud_profiler_agent', '~> 0.0.0', path: 'vendor/gems/cloud_profiler_agent', require: false # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'cloud_profiler_agent', '~> 0.0.0', path: 'vendor/gems/cloud_profiler_agent', require: false,
+  feature_category: :shared
 
-# Snowplow events tracking
-gem 'snowplow-tracker', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory
+# Snowplow events trackin
+gem 'snowplow-tracker', '~> 0.8.0', feature_category: :product_analytics
 
 # Metrics
-gem 'webrick', '~> 1.8.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'prometheus-client-mmap', '~> 1.1', '>= 1.1.1', require: 'prometheus/client' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'webrick', '~> 1.8.1', require: false, feature_category: :shared
+gem 'prometheus-client-mmap', '~> 1.1', '>= 1.1.1', require: 'prometheus/client', feature_category: :shared
 
 # Event-driven reactor for Ruby
 # Required manually in config/initializers/require_async_gem
-gem 'async', '~> 2.12.1', require: false # rubocop:disable Gemfile/MissingFeatureCategory -- This is general utility gem
+gem 'async', '~> 2.12.1', require: false, feature_category: :shared
 
 # Security report schemas used to validate CI job artifacts of security jobs
 gem 'gitlab-security_report_schemas', '0.1.2.min15.0.0.max15.2.1', feature_category: :vulnerability_management
@@ -466,22 +471,22 @@ group :opentelemetry do
   gem 'opentelemetry-instrumentation-sidekiq', feature_category: :observability
 end
 
-gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'warning', '~> 1.3.0', feature_category: :shared
 
 group :development do
   gem 'lefthook', '~> 1.7.0', require: false, feature_category: :tooling
   gem 'rubocop', feature_category: :tooling
-  gem 'solargraph', '~> 0.47.2', require: false # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'solargraph', '~> 0.47.2', require: false, feature_category: :shared
 
-  gem 'letter_opener_web', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
-  gem 'lookbook', '~> 2.3' # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'letter_opener_web', '~> 3.0.0', feature_category: :shared
+  gem 'lookbook', '~> 2.3', feature_category: :shared
 
   # Better errors handler
-  gem 'better_errors', '~> 2.10.1' # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'better_errors', '~> 2.10.1', feature_category: :shared
 
-  gem 'sprite-factory', '~> 1.7' # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'sprite-factory', '~> 1.7', feature_category: :shared
 
-  gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'listen', '~> 3.7', feature_category: :shared
 
   gem 'ruby-lsp', "~> 0.22.0", require: false, feature_category: :tooling
 
@@ -498,33 +503,33 @@ group :development do
 end
 
 group :development, :test do
-  gem 'deprecation_toolkit', '~> 1.5.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-  gem 'bullet', '~> 7.1.2' # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'deprecation_toolkit', '~> 1.5.1', require: false, feature_category: :shared
+  gem 'bullet', '~> 7.1.2', feature_category: :shared
   gem 'parser', '= 3.3.6.0', feature_category: :shared
-  gem 'pry-byebug' # rubocop:todo Gemfile/MissingFeatureCategory
-  gem 'pry-rails', '~> 0.3.9' # rubocop:todo Gemfile/MissingFeatureCategory
-  gem 'pry-shell', '~> 0.6.4' # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'pry-byebug', feature_category: :shared
+  gem 'pry-rails', '~> 0.3.9', feature_category: :shared
+  gem 'pry-shell', '~> 0.6.4', feature_category: :shared
 
-  gem 'awesome_print', require: false # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'awesome_print', require: false, feature_category: :shared
 
   gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database
   gem 'rspec-rails', '~> 7.0.0', feature_category: :shared
   gem 'factory_bot_rails', '~> 6.4.3', feature_category: :tooling
 
   # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
-  gem 'minitest', '~> 5.11.0' # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'minitest', '~> 5.11.0', feature_category: :shared
 
-  gem 'spring', '~> 4.1.0' # rubocop:todo Gemfile/MissingFeatureCategory
-  gem 'spring-commands-rspec', '~> 1.0.4' # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'spring', '~> 4.1.0', feature_category: :shared
+  gem 'spring-commands-rspec', '~> 1.0.4', feature_category: :shared
 
   gem 'gitlab-styles', '~> 13.0.2', feature_category: :tooling
   gem 'haml_lint', '~> 0.58', feature_category: :tooling
 
-  gem 'bundler-audit', '~> 0.9.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'bundler-audit', '~> 0.9.1', require: false, feature_category: :shared
 
   # Benchmarking & profiling
-  gem 'benchmark-ips', '~> 2.11.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-  gem 'benchmark-memory', '~> 0.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'benchmark-ips', '~> 2.11.0', require: false, feature_category: :shared
+  gem 'benchmark-memory', '~> 0.1', require: false, feature_category: :shared
 
   # Profiling data from CI/CD pipelines
   gem 'influxdb-client', '~> 3.1', require: false, feature_category: :tooling
@@ -533,15 +538,15 @@ group :development, :test do
   gem 'crystalball', '~> 0.7.0', require: false, feature_category: :tooling
   gem 'test_file_finder', '~> 0.3.1', feature_category: :tooling
 
-  gem 'simple_po_parser', '~> 1.1.6', require: false # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'simple_po_parser', '~> 1.1.6', require: false, feature_category: :shared
 
-  gem 'png_quantizator', '~> 0.2.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'png_quantizator', '~> 0.2.1', require: false, feature_category: :shared
 
-  gem 'parallel', '~> 1.19', require: false # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'parallel', '~> 1.19', require: false, feature_category: :shared
 
-  gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup' # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup', feature_category: :shared
 
-  gem 'pact', '~> 1.64' # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'pact', '~> 1.64', feature_category: :shared
 
   # For now we only use vite in development / test, and not for production builds
   # See: https://gitlab.com/gitlab-org/frontend/rfcs/-/issues/106
@@ -564,17 +569,17 @@ end
 
 # Gems required in omnibus-gitlab pipeline
 group :development, :test, :omnibus do
-  gem 'license_finder', '~> 7.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'license_finder', '~> 7.0', require: false, feature_category: :shared
 end
 
 # Gems required in various pipelines
 group :development, :test, :monorepo do
-  gem 'gitlab-rspec', path: 'gems/gitlab-rspec' # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'gitlab-rspec', path: 'gems/gitlab-rspec', feature_category: :shared
   gem 'gitlab-rspec_flaky', path: 'gems/gitlab-rspec_flaky', feature_category: :tooling
 end
 
 group :test do
-  gem 'fuubar', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'fuubar', '~> 2.2.0', feature_category: :tooling
   gem 'rspec-retry', '~> 0.6.2', feature_category: :tooling
   gem 'rspec_profiling', '~> 0.0.9', feature_category: :tooling
   gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling
@@ -585,20 +590,20 @@ group :test do
   gem 'capybara-screenshot', '~> 1.0.26', feature_category: :test_platform
   gem 'selenium-webdriver', '~> 4.21', '>= 4.21.1', feature_category: :test_platform
 
-  gem 'graphlyte', '~> 1.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'graphlyte', '~> 1.0.0', feature_category: :shared
 
-  gem 'shoulda-matchers', '~> 5.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-  gem 'email_spec', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'shoulda-matchers', '~> 5.1.0', require: false, feature_category: :shared
+  gem 'email_spec', '~> 2.2.0', feature_category: :shared
   gem 'webmock', '~> 3.24.0', feature_category: :shared
-  gem 'rails-controller-testing' # rubocop:todo Gemfile/MissingFeatureCategory
-  gem 'concurrent-ruby', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'rails-controller-testing', feature_category: :shared
+  gem 'concurrent-ruby', '~> 1.1', feature_category: :shared
   gem 'test-prof', '~> 1.4.0', feature_category: :tooling
-  gem 'rspec_junit_formatter' # rubocop:todo Gemfile/MissingFeatureCategory
-  gem 'guard-rspec' # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'rspec_junit_formatter', feature_category: :shared
+  gem 'guard-rspec', feature_category: :shared
   gem 'axe-core-rspec', '~> 4.9.0', feature_category: :tooling
 
   # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
-  gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'derailed_benchmarks', require: false, feature_category: :shared
 
   gem 'gitlab_quality-test_tooling', '~> 2.4.0', require: false, feature_category: :tooling
 end
@@ -609,32 +614,32 @@ gem 'faraday-multipart', '~> 1.0', feature_category: :importers
 
 gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared
 
-gem 'email_reply_trimmer', '~> 0.1' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'html2text' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'email_reply_trimmer', '~> 0.1', feature_category: :shared
+gem 'html2text', feature_category: :shared
 
 gem 'stackprof', '~> 0.2.26', require: false, feature_category: :shared
-gem 'rbtrace', '~> 0.4', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'memory_profiler', '~> 1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'activerecord-explain-analyze', '~> 0.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'rbtrace', '~> 0.4', require: false, feature_category: :shared
+gem 'memory_profiler', '~> 1.0', require: false, feature_category: :shared
+gem 'activerecord-explain-analyze', '~> 0.1', require: false, feature_category: :shared
 
 # OAuth
-gem 'oauth2', '~> 2.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'oauth2', '~> 2.0', feature_category: :system_access
 
 # Health check
-gem 'health_check', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'health_check', '~> 3.0', feature_category: :shared
 
 # System information
-gem 'vmstat', '~> 2.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'sys-filesystem', '~> 1.4.3' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'vmstat', '~> 2.3.0', feature_category: :shared
+gem 'sys-filesystem', '~> 1.4.3', feature_category: :shared
 
 # NTP client
-gem 'net-ntp' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'net-ntp', feature_category: :shared
 
 # SSH keys support
-gem 'ssh_data', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'ssh_data', '~> 1.3', feature_category: :shared
 
 # Spamcheck GRPC protocol definitions
-gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat
 
 # Gitaly GRPC protocol definitions
 gem 'gitaly', '~> 17.7.0', feature_category: :gitaly
@@ -648,31 +653,31 @@ gem 'gitlab-kas-grpc', '~> 17.7.0', feature_category: :deployment_management
 # that it doesn't have the same issues.
 gem 'grpc', '= 1.63.0', feature_category: :shared
 
-gem 'google-protobuf', '~> 3.25', '>= 3.25.3' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared
 
-gem 'toml-rb', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'toml-rb', '~> 2.2.0', feature_category: :shared
 
 # Feature toggles
-gem 'flipper', '~> 0.26.2' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'flipper-active_record', '~> 0.26.2' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'flipper-active_support_cache_store', '~> 0.26.2' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'unleash', '~> 3.2.2' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'flipper', '~> 0.26.2', feature_category: :shared
+gem 'flipper-active_record', '~> 0.26.2', feature_category: :shared
+gem 'flipper-active_support_cache_store', '~> 0.26.2', feature_category: :shared
+gem 'unleash', '~> 3.2.2', feature_category: :shared
 gem 'gitlab-experiment', '~> 0.9.1', feature_category: :shared
 
 # Structured logging
-gem 'lograge', '~> 0.5' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'lograge', '~> 0.5', feature_category: :shared
 gem 'grape_logging', '~> 1.8', '>= 1.8.4', feature_category: :api
 
 # DNS Lookup
-gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'gitlab-net-dns', '~> 0.9.2', feature_category: :shared
 
 # Countries list
-gem 'countries', '~> 4.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'countries', '~> 4.0.0', feature_category: :shared
 
-gem 'retriable', '~> 3.1.2' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'retriable', '~> 3.1.2', feature_category: :shared
 
 # LRU cache
-gem 'lru_redux' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'lru_redux', feature_category: :shared
 
 # Locked as long as quoted-printable encoding issues are not resolved
 # Monkey-patched in `config/initializers/mail_encoding_patch.rb`
@@ -681,60 +686,60 @@ gem 'lru_redux' # rubocop:todo Gemfile/MissingFeatureCategory
 # `config/initializers/mail_starttls_patch.rb` has also been patched to
 # fix STARTTLS handling until https://github.com/mikel/mail/pull/1536 is
 # released.
-gem 'mail', '= 2.8.1' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'mail-smtp_pool', '~> 0.1.0', path: 'vendor/gems/mail-smtp_pool', require: false # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'mail', '= 2.8.1', feature_category: :shared
+gem 'mail-smtp_pool', '~> 0.1.0', path: 'vendor/gems/mail-smtp_pool', require: false, feature_category: :shared
 
-gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer', feature_category: :shared
 
 # File encryption
-gem 'lockbox', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'lockbox', '~> 1.3.0', feature_category: :shared
 
 # Email validation
-gem 'valid_email', '~> 0.1' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'valid_email', '~> 0.1', feature_category: :shared
 
 # JSON
-gem 'jsonb_accessor', '~> 1.4' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'jsonb_accessor', '~> 1.4', feature_category: :shared
 gem 'json', '~> 2.7.2', feature_category: :shared
 gem 'json_schemer', '~> 2.3.0', feature_category: :shared
-gem 'oj', '~> 3.13.21' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'oj-introspect', '~> 0.7' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'multi_json', '~> 1.14.1' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'yajl-ruby', '~> 1.4.3', require: 'yajl' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'oj', '~> 3.13.21', feature_category: :shared
+gem 'oj-introspect', '~> 0.7', feature_category: :shared
+gem 'multi_json', '~> 1.14.1', feature_category: :shared
+gem 'yajl-ruby', '~> 1.4.3', require: 'yajl', feature_category: :shared
 
-gem 'webauthn', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'webauthn', '~> 3.0', feature_category: :shared
 
 # IPAddress utilities
-gem 'ipaddress', '~> 0.8.3' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'ipaddress', '~> 0.8.3', feature_category: :shared
 
-gem 'parslet', '~> 1.8' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'parslet', '~> 1.8', feature_category: :shared
 
-gem 'ipynbdiff', path: 'gems/ipynbdiff', require: 'ipynb_diff' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'ipynbdiff', path: 'gems/ipynbdiff', require: 'ipynb_diff', feature_category: :shared
 
-gem 'ed25519', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'ed25519', '~> 1.3.0', feature_category: :shared
 
 # Error Tracking OpenAPI client
 # See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature
-gem 'error_tracking_open_api', path: 'gems/error_tracking_open_api' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'error_tracking_open_api', path: 'gems/error_tracking_open_api', feature_category: :shared
 
 # Vulnerability advisories
-gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite', feature_category: :software_composition_analysis
 
 # Work with RPM packages
-gem 'arr-pm', '~> 0.0.12' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'arr-pm', '~> 0.0.12', feature_category: :package_registry
 
 # Remote Development
 gem 'devfile', '~> 0.1.1', feature_category: :workspaces
 
 # Apple plist parsing
-gem 'CFPropertyList', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'app_store_connect' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'CFPropertyList', '~> 3.0.0', feature_category: :mobile_devops
+gem 'app_store_connect', feature_category: :mobile_devops
 
 # For phone verification
-gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'telesignenterprise', '~> 2.2', feature_category: :insider_threat
 
 # BufferedIO patch
 # Updating this version will require updating scripts/allowed_warnings.txt
-gem 'net-protocol', '~> 0.1.3' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'net-protocol', '~> 0.1.3', feature_category: :shared
 
 # This is locked to 0.6.0 because we patch Net::HTTP#connect in
 # gems/gitlab-http/lib/net_http/connect_patch.rb.
@@ -745,13 +750,13 @@ gem 'net-http', '= 0.6.0', feature_category: :shared
 # See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/173142#note_2277952450
 gem 'uri', '= 0.13.0', feature_category: :shared
 
-gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'duo_api', '~> 1.3', feature_category: :system_access
 
 gem 'gitlab-sdk', '~> 0.3.0', feature_category: :application_instrumentation
 
-gem 'openbao_client', path: 'gems/openbao_client' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'openbao_client', path: 'gems/openbao_client', feature_category: :artifact_security
 
-gem 'paper_trail', '~> 15.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'paper_trail', '~> 15.0', feature_category: :shared
 
 gem "i18n_data", "~> 0.13.1", feature_category: :system_access