Enable Performance/RedundantMatch

7 files changed, 8 insertions, 15 deletions

diff --git a/.rubocop.yml b/.rubocop.yml
index 9087b626bb9..3aae3a0261b 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -926,6 +926,9 @@ Lint/UnusedBlockArgument:
 Performance/RedundantBlockCall:
   Enabled: true
 
+Performance/RedundantMatch:
+  Enabled: true
+
 Rails/HttpPositionalArguments:
   Enabled: false
 
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index abd7be72b46..a7b89d3dba2 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -6,16 +6,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 5
-# Cop supports --auto-correct.
-Performance/RedundantMatch:
-  Exclude:
-    - 'app/models/external_issue.rb'
-    - 'lib/ci/api/helpers.rb'
-    - 'lib/extracts_path.rb'
-    - 'lib/gitlab/diff/highlight.rb'
-    - 'lib/gitlab/diff/parser.rb'
-
 # Offense count: 15
 # Configuration parameters: CustomIncludeMethods.
 RSpec/EmptyExampleGroup:
diff --git a/app/models/external_issue.rb b/app/models/external_issue.rb
index 26712c19b5a..b973bbcd8da 100644
--- a/app/models/external_issue.rb
+++ b/app/models/external_issue.rb
@@ -43,7 +43,7 @@ class ExternalIssue
   end
 
   def reference_link_text(from_project = nil)
-    return "##{id}" if /^\d+$/.match(id)
+    return "##{id}" if id =~ /^\d+$/
 
     id
   end
diff --git a/lib/ci/api/helpers.rb b/lib/ci/api/helpers.rb
index 654bddf7d18..a2e6387dbe5 100644
--- a/lib/ci/api/helpers.rb
+++ b/lib/ci/api/helpers.rb
@@ -60,7 +60,7 @@ module Ci
       end
 
       def build_not_found!
-        if headers['User-Agent'].to_s.match(/gitlab-ci-multi-runner \d+\.\d+\.\d+(~beta\.\d+\.g[0-9a-f]+)? /)
+        if headers['User-Agent'].to_s =~ /gitlab-ci-multi-runner \d+\.\d+\.\d+(~beta\.\d+\.g[0-9a-f]+)? /
           no_content!
         else
           not_found!
diff --git a/lib/extracts_path.rb b/lib/extracts_path.rb
index 82551f1f222..1a6ad039bc0 100644
--- a/lib/extracts_path.rb
+++ b/lib/extracts_path.rb
@@ -42,7 +42,7 @@ module ExtractsPath
 
     return pair unless @project
 
-    if id.match(/^([[:alnum:]]{40})(.+)/)
+    if id =~ /^([[:alnum:]]{40})(.+)/
       # If the ref appears to be a SHA, we're done, just split the string
       pair = $~.captures
     else
diff --git a/lib/gitlab/diff/highlight.rb b/lib/gitlab/diff/highlight.rb
index 9ea976e18fa..7db896522a9 100644
--- a/lib/gitlab/diff/highlight.rb
+++ b/lib/gitlab/diff/highlight.rb
@@ -50,7 +50,7 @@ module Gitlab
         # Only update text if line is found. This will prevent
         # issues with submodules given the line only exists in diff content.
         if rich_line
-          line_prefix = diff_line.text.match(/\A(.)/) ? $1 : ' '
+          line_prefix = diff_line.text =~ /\A(.)/ ? $1 : ' '
           "#{line_prefix}#{rich_line}".html_safe
         end
       end
diff --git a/lib/gitlab/diff/parser.rb b/lib/gitlab/diff/parser.rb
index 89320f5d9dc..8f844224a7a 100644
--- a/lib/gitlab/diff/parser.rb
+++ b/lib/gitlab/diff/parser.rb
@@ -20,7 +20,7 @@ module Gitlab
 
             full_line = line.delete("\n")
 
-            if line.match(/^@@ -/)
+            if line =~ /^@@ -/
               type = "match"
 
               line_old = line.match(/\-[0-9]*/)[0].to_i.abs rescue 0