Merge branch...

Merge branch '214501-file-location-of-vulnerability-shows-colon-after-file-if-no-line-number-exists' into 'master'

Remove colon from Vulnerability file name if no line number exists

See merge request gitlab-org/gitlab!30069

ee/app/helpers/vulnerabilities_helper.rb

@@ -49,9 +49,13 @@ module VulnerabilitiesHelper
     finding = vulnerability.finding
     location = finding.location
     branch = finding.pipelines&.last&.sha || vulnerability.project.default_branch
-    link_text = "#{location['file']}:#{location['start_line']}"
-    offset = location['start_line'] ? "#L#{location['start_line']}" : ''
-    link_path = project_blob_path(vulnerability.project, tree_join(branch, location['file'])) + offset
+    link_text = location['file']
+    link_path = project_blob_path(vulnerability.project, tree_join(branch, location['file']))
+
+    if location['start_line']
+      link_text += ":#{location['start_line']}"
+      link_path += "#L#{location['start_line']}"
+    end
 
     link_to link_text, link_path, target: '_blank', rel: 'noopener noreferrer'
   end

ee/spec/helpers/vulnerabilities_helper_spec.rb

@@ -150,6 +150,7 @@ describe VulnerabilitiesHelper do
         vulnerability.finding.save
 
         expect(subject).not_to include('#L')
+        expect(subject).not_to match(/#{vulnerability.finding.location['file']}:\d*/)
       end
     end
   end