From 497b73152109b6da922e1a8ffd8ab193f7f3fcd3 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 3 Sep 2020 03:08:12 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 lib/gitlab/ci/features.rb                      | 4 ----
 lib/gitlab/kubernetes/cilium_network_policy.rb | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'lib/gitlab')

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
-- 
cgit v1.2.3