Add latest changes from gitlab-org/gitlab@master

2 files changed, 1 insertions, 5 deletions

diff --git a/lib/gitlab/ci/features.rb b/lib/gitlab/ci/features.rb
index 7e7fa88c73b..957eee8587d 100644
--- a/lib/gitlab/ci/features.rb
+++ b/lib/gitlab/ci/features.rb
@@ -68,10 +68,6 @@ module Gitlab
         ::Feature.enabled?(:ci_lint_creates_pipeline_with_dry_run, project, default_enabled: true)
       end
 
-      def self.reset_ci_minutes_for_all_namespaces?
-        ::Feature.enabled?(:reset_ci_minutes_for_all_namespaces, default_enabled: false)
-      end
-
       def self.project_transactionless_destroy?(project)
         Feature.enabled?(:project_transactionless_destroy, project, default_enabled: false)
       end
diff --git a/lib/gitlab/kubernetes/cilium_network_policy.rb b/lib/gitlab/kubernetes/cilium_network_policy.rb
index 71915040839..9bd8a17839b 100644
--- a/lib/gitlab/kubernetes/cilium_network_policy.rb
+++ b/lib/gitlab/kubernetes/cilium_network_policy.rb
@@ -82,7 +82,7 @@ module Gitlab
           endpointSelector: selector,
           ingress: ingress,
           egress: egress
-        }
+        }.compact!
       end
 
       override :kind