Merge branch 'pl-rubocop-todo-rescue-ensure-alignment' into 'master'

Fixed rubocop offense Layout/RescueEnsureAlignment

See merge request gitlab-org/gitlab!56870

.rubocop_todo.yml

@@ -76,20 +76,6 @@ Layout/LineLength:
 Layout/MultilineOperationIndentation:
   Enabled: false
 
-# Offense count: 11
-# 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/concerns/reactive_cacheable_worker.rb'
-    - 'app/workers/delete_stored_files_worker.rb'
-    - 'config/initializers/1_settings.rb'
-    - 'config/initializers/trusted_proxies.rb'
-    - 'lib/api/internal/base.rb'
-    - 'lib/gitlab/highlight.rb'
-
 # Offense count: 53
 # Cop supports --auto-correct.
 Layout/SpaceAroundMethodCallOperator:

app/models/blob_viewer/dependency_manager.rb

@@ -33,8 +33,8 @@ module BlobViewer
       @json_data ||= begin
         prepare!
         Gitlab::Json.parse(blob.data)
-                     rescue
-                       {}
+      rescue
+        {}
       end
     end
 

app/models/project.rb

@@ -2147,8 +2147,8 @@ class Project < ApplicationRecord
         data = repository.route_map_for(sha)
 
         Gitlab::RouteMap.new(data) if data
-               rescue Gitlab::RouteMap::FormatError
-                 nil
+      rescue Gitlab::RouteMap::FormatError
+        nil
       end
     end
 

app/services/prometheus/proxy_service.rb

@@ -44,8 +44,8 @@ module Prometheus
     def self.from_cache(proxyable_class_name, proxyable_id, method, path, params)
       proxyable_class = begin
         proxyable_class_name.constantize
-                        rescue NameError
-                          nil
+      rescue NameError
+        nil
       end
       return unless proxyable_class
 

app/workers/delete_stored_files_worker.rb

@@ -9,8 +9,8 @@ class DeleteStoredFilesWorker # rubocop:disable Scalability/IdempotentWorker
   def perform(class_name, keys)
     klass = begin
       class_name.constantize
-            rescue NameError
-              nil
+    rescue NameError
+      nil
     end
 
     unless klass

changelogs/unreleased/pl-rubocop-todo-rescue-ensure-alignment.yml

+---
+title: Fix offense Layout/RescueEnsureAlignment
+merge_request: 56870
+author: Shubham Kumar (@imskr)
+type: fixed

config/initializers/1_settings.rb

@@ -184,8 +184,8 @@ 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
-                                   '/home/' + Settings.gitlab['user']
+rescue ArgumentError # no user configured
+  '/home/' + Settings.gitlab['user']
 end
 Settings.gitlab['time_zone'] ||= nil
 Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil?

config/initializers/trusted_proxies.rb

@@ -17,7 +17,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 = (

lib/gitlab/highlight.rb

@@ -33,8 +33,8 @@ module Gitlab
     def lexer
       @lexer ||= custom_language || begin
         Rouge::Lexer.guess(filename: @blob_name, source: @blob_content).new
-                                    rescue Rouge::Guesser::Ambiguous => e
-                                      e.alternatives.min_by(&:tag)
+      rescue Rouge::Guesser::Ambiguous => e
+        e.alternatives.min_by(&:tag)
       end
     end