Commit fb32853a authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '225218-format-conan-package-manager' into 'master'

Format Conan package manager in Dependency List

See merge request gitlab-org/gitlab!40811
parents 16b88736 92cba017
---
title: Format Conan package manager in Dependency List
merge_request: 40811
author:
type: added
...@@ -62,6 +62,8 @@ module Gitlab ...@@ -62,6 +62,8 @@ module Gitlab
'Java (Maven)' 'Java (Maven)'
when 'composer' when 'composer'
'PHP (Composer)' 'PHP (Composer)'
when 'conan'
'C/C++ (Conan)'
else else
package_manager package_manager
end end
......
...@@ -60,6 +60,7 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Formatters::DependencyList do ...@@ -60,6 +60,7 @@ RSpec.describe Gitlab::Ci::Parsers::Security::Formatters::DependencyList do
'pip' | 'Python (pip)' 'pip' | 'Python (pip)'
'maven' | 'Java (Maven)' 'maven' | 'Java (Maven)'
'composer' | 'PHP (Composer)' 'composer' | 'PHP (Composer)'
'conan' | 'C/C++ (Conan)'
'' | '' '' | ''
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment