From c11591217a3b923a0ce36e0259bbb88c2e1601e7 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 22 Jun 2020 06:08:28 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .rubocop_todo.yml                                    | 9 ---------
 lib/banzai/filter/commit_trailers_filter.rb          | 5 +----
 lib/gitlab/analytics/cycle_analytics/stage_events.rb | 2 +-
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 28c5f33d936..b671ca9a9d5 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 02a47556151..5288db3b0cb 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 5146f92f521..39dc706dff5 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