Merge branch 'rescue-alignment' into 'master'

Fix Layout/RescueEnsureAlignment Cop

See merge request gitlab-org/gitlab!41093

.rubocop_todo.yml

@@ -69,20 +69,6 @@ Layout/LineLength:
 Layout/MultilineOperationIndentation:
   Enabled: false
 
-# Offense count: 9
-# Cop supports --auto-correct.
-Layout/RescueEnsureAlignment:
-  Exclude:
-    - 'app/models/blob_viewer/dependency_manager.rb'
-    - 'app/models/project.rb'
-    - 'app/services/prometheus/proxy_service.rb'
-    - 'app/workers/delete_stored_files_worker.rb'
-    - 'config/initializers/1_settings.rb'
-    - 'config/initializers/trusted_proxies.rb'
-    - 'lib/gitlab/background_migration/archive_legacy_traces.rb'
-    - 'lib/gitlab/highlight.rb'
-    - 'lib/tasks/gitlab/lfs/migrate.rake'
-
 # Offense count: 36
 # Cop supports --auto-correct.
 Layout/SpaceAroundMethodCallOperator:

changelogs/unreleased/rescue-alignment.yml

+---
+title: Fix Layout/RescueEnsureAlignment cop
+merge_request: 41093
+author: Rajendra Kadam
+type: fixed

config/initializers/1_settings.rb

@@ -176,7 +176,7 @@ Settings.gitlab['user'] ||= 'git'
 Settings.gitlab['ssh_user'] ||= Settings.gitlab.user
 Settings.gitlab['user_home'] ||= begin
   Etc.getpwnam(Settings.gitlab['user']).dir
-rescue ArgumentError # no user configured
+                                 rescue ArgumentError # no user configured
                                    '/home/' + Settings.gitlab['user']
 end
 Settings.gitlab['time_zone'] ||= nil

config/initializers/trusted_proxies.rb

@@ -15,7 +15,7 @@ end
 
 gitlab_trusted_proxies = Array(Gitlab.config.gitlab.trusted_proxies).map do |proxy|
   IPAddr.new(proxy)
-rescue IPAddr::InvalidAddressError
+                         rescue IPAddr::InvalidAddressError
 end.compact
 
 Rails.application.config.action_dispatch.trusted_proxies = (