Merge branch '8217_remove_deprecated_licensed_feature_sast_container' into 'master'

Remove sast_container from licensed features

See merge request gitlab-org/gitlab-ee!14980

ee/app/models/ee/namespace.rb

@@ -265,7 +265,7 @@ module EE
       ::Feature.enabled?(:store_security_reports, self, default_enabled: true) && (
         feature_available?(:sast) ||
         feature_available?(:dependency_scanning) ||
-        feature_available?(:sast_container) ||
+        feature_available?(:container_scanning) ||
         feature_available?(:dast))
     end
 

ee/app/models/license.rb

@@ -99,7 +99,6 @@ class License < ApplicationRecord
     dependency_list
     license_management
     sast
-    sast_container
     container_scanning
     cluster_health
     dast

ee/changelogs/unreleased/8217_remove_deprecated_licensed_feature_sast_container.yml

+---
+title: Remove deprecated name sast_container from licensed features
+merge_request: 14980
+author:
+type: other