Add latest changes from gitlab-org/gitlab@master

3 files changed, 7 insertions, 6 deletions

diff --git a/gems/config/rubocop.yml b/gems/config/rubocop.yml
index ca46e30e2cd..7cad83bbe66 100644
--- a/gems/config/rubocop.yml
+++ b/gems/config/rubocop.yml
@@ -96,10 +96,6 @@ RSpec/ContextWording:
 RSpec/FeatureCategory:
   Enabled: false
 
-# Enable once we drop 3.0 support
-Style/HashSyntax:
-  Enabled: false
-
 Style/InlineDisableAnnotation:
   Enabled: false
 
@@ -114,3 +110,8 @@ Style/RegexpLiteralMixedPreserve:
     - mixed
     - mixed_preserve
   EnforcedStyle: mixed_preserve
+
+# Short-hand Hash syntax does not work prior 3.1.
+# See https://gitlab.com/gitlab-org/gitlab/-/issues/435940#note_1703307479
+Style/HashSyntax:
+  EnforcedShorthandSyntax: never
diff --git a/gems/gitlab-housekeeper/Gemfile.lock b/gems/gitlab-housekeeper/Gemfile.lock
index 2b18c02558c..8da2b8cd8c9 100644
--- a/gems/gitlab-housekeeper/Gemfile.lock
+++ b/gems/gitlab-housekeeper/Gemfile.lock
@@ -122,7 +122,7 @@ GEM
       hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
-  arm64-darwin-22
+  ruby
 
 DEPENDENCIES
   gitlab-housekeeper!
diff --git a/gems/gitlab-secret_detection/lib/gitlab/secret_detection/scan.rb b/gems/gitlab-secret_detection/lib/gitlab/secret_detection/scan.rb
index 20d630d5dbb..802ae9fefdd 100644
--- a/gems/gitlab-secret_detection/lib/gitlab/secret_detection/scan.rb
+++ b/gems/gitlab-secret_detection/lib/gitlab/secret_detection/scan.rb
@@ -152,7 +152,7 @@ module Gitlab
           # ignore the line scan if it is suffixed with '#gitleaks:allow'
           next if line.end_with?(GITLEAKS_KEYWORD_IGNORE)
 
-          patterns = pattern_matcher.match(line, :exception => false)
+          patterns = pattern_matcher.match(line, exception: false)
           next unless patterns.any?
 
           line_number = index + 1