diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 28c5f33d93605046413f40089bf8426b841abcf7..b671ca9a9d556966ffd718fa2a5d52d26140e268 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -560,15 +560,6 @@ Style/GuardClause: Style/HashEachMethods: Enabled: false -# Offense count: 6 -# Cop supports --auto-correct. -Style/HashTransformKeys: - Exclude: - - 'ee/app/models/vulnerabilities/occurrence.rb' - - 'ee/spec/lib/gitlab/ci/templates/dependency_scanning_gitlab_ci_yaml_spec.rb' - - 'lib/banzai/filter/commit_trailers_filter.rb' - - 'lib/gitlab/analytics/cycle_analytics/stage_events.rb' - # Offense count: 31 # Configuration parameters: AllowIfModifier. Style/IfInsideElse: diff --git a/lib/banzai/filter/commit_trailers_filter.rb b/lib/banzai/filter/commit_trailers_filter.rb index 02a4755615144dae845e19ea6d3cae03e23096aa..5288db3b0cb301693d44a09524eed3fbbaba4e82 100644 --- a/lib/banzai/filter/commit_trailers_filter.rb +++ b/lib/banzai/filter/commit_trailers_filter.rb @@ -144,10 +144,7 @@ module Banzai end def data_attributes_from_hash(data = {}) - data.reject! {|_, value| value.nil?} - data.map do |key, value| - [%(data-#{key.to_s.dasherize}), value] - end.to_h + data.compact.transform_keys { |key| %(data-#{key.to_s.dasherize}) } end end end diff --git a/lib/gitlab/analytics/cycle_analytics/stage_events.rb b/lib/gitlab/analytics/cycle_analytics/stage_events.rb index 5146f92f5211fe4a75b1cdb9dfeaff8487584e30..39dc706dff5590f56643a1cc14c4951d11dfb3ea 100644 --- a/lib/gitlab/analytics/cycle_analytics/stage_events.rb +++ b/lib/gitlab/analytics/cycle_analytics/stage_events.rb @@ -60,7 +60,7 @@ module Gitlab # hash for defining ActiveRecord enum: identifier => number def self.to_enum - enum_mapping.each_with_object({}) { |(k, v), hash| hash[k.identifier] = v } + enum_mapping.transform_keys { |k| k.identifier } end def self.pairing_rules