Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 8 deletions

diff --git a/lib/api/helpers/packages/dependency_proxy_helpers.rb b/lib/api/helpers/packages/dependency_proxy_helpers.rb
index dc81e5e1b51..1ae863a5a25 100644
--- a/lib/api/helpers/packages/dependency_proxy_helpers.rb
+++ b/lib/api/helpers/packages/dependency_proxy_helpers.rb
@@ -45,7 +45,7 @@ module API
 
           raise ArgumentError, "Can't find application setting for package_type #{package_type}" unless application_setting_name
 
-          if target.present? && Feature.enabled?(:cascade_package_forwarding_settings, target)
+          if target.present?
             target.public_send(application_setting_name) # rubocop:disable GitlabSecurity/PublicSend
           else
             ::Gitlab::CurrentSettings
diff --git a/lib/gitlab/ci/parsers/security/common.rb b/lib/gitlab/ci/parsers/security/common.rb
index 0c117d5f214..c437bec965f 100644
--- a/lib/gitlab/ci/parsers/security/common.rb
+++ b/lib/gitlab/ci/parsers/security/common.rb
@@ -157,13 +157,7 @@ module Gitlab
                 signature_value: value
               )
 
-              if signature.valid?
-                signature
-              else
-                e = SecurityReportParserError.new("Vulnerability tracking signature is not valid: #{signature}")
-                Gitlab::ErrorTracking.track_exception(e)
-                nil
-              end
+              signature if signature.valid?
             end.compact
           end