diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-03 06:08:12 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-03 06:08:12 +0300 |
commit | 497b73152109b6da922e1a8ffd8ab193f7f3fcd3 (patch) | |
tree | b63d8745c5f549eaa05f9e0ab0cf9609f45b7785 /lib | |
parent | c8489a149e99123aa1d7425677eb720c31ae7dd8 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/ci/features.rb | 4 | ||||
-rw-r--r-- | lib/gitlab/kubernetes/cilium_network_policy.rb | 2 |
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 |