Merge branch 'lint-uri-regex' into 'master'

Fix Lint/UriRegexp cop

See merge request gitlab-org/gitlab!41117

.rubocop_todo.yml

@@ -113,14 +113,6 @@ Lint/UriEscapeUnescape:
     - 'spec/lib/google_api/auth_spec.rb'
     - 'spec/requests/api/files_spec.rb'
 
-# Offense count: 3
-# Cop supports --auto-correct.
-Lint/UriRegexp:
-  Exclude:
-    - 'app/models/concerns/mentionable/reference_regexes.rb'
-    - 'app/services/projects/download_service.rb'
-    - 'lib/gitlab/ci/pipeline/chain/config/content/remote.rb'
-
 # Offense count: 65
 # Cop supports --auto-correct.
 Migration/DepartmentName:

app/models/concerns/mentionable/reference_regexes.rb

@@ -30,7 +30,7 @@ module Mentionable
     def self.external_pattern
       strong_memoize(:external_pattern) do
         issue_pattern = IssueTrackerService.reference_pattern
-        link_patterns = URI.regexp(%w(http https))
+        link_patterns = URI::DEFAULT_PARSER.make_regexp(%w(http https))
         reference_pattern(link_patterns, issue_pattern)
       end
     end

app/services/projects/download_service.rb

@@ -27,7 +27,7 @@ module Projects
     end
 
     def http?(url)
-      url =~ /\A#{URI.regexp(%w(http https))}\z/
+      url =~ /\A#{URI::DEFAULT_PARSER.make_regexp(%w(http https))}\z/
     end
 
     def valid_domain?(url)

changelogs/unreleased/lint-uri-regex.yml

+---
+title: Fix Lint/UriRegexp cop
+merge_request: 41117
+author: Rajendra Kadam
+type: fixed

lib/gitlab/ci/pipeline/chain/config/content/remote.rb

@@ -9,7 +9,7 @@ module Gitlab
             class Remote < Source
               def content
                 strong_memoize(:content) do
-                  next unless ci_config_path =~ URI.regexp(%w[http https])
+                  next unless ci_config_path =~ URI::DEFAULT_PARSER.make_regexp(%w[http https])
 
                   YAML.dump('include' => [{ 'remote' => ci_config_path }])
                 end