diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-01 09:10:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-01 09:10:44 +0300 |
| commit | 0a6b0190477aec55a1cff8e2812b177ea6df39b2 (patch) | |
| tree | 31f9b4e56b7284016fda96ad21d4750ece2ec1d7 /lib/gitlab | |
| parent | 4be784ea00ee98983c29568bfc7914e625a98b6e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/ci/features.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/usage_data.rb | 1 | ||||
| -rw-r--r-- | lib/gitlab/usage_data_counters/known_events.yml | 5 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/gitlab/ci/features.rb b/lib/gitlab/ci/features.rb index da66cec935c..7e7fa88c73b 100644 --- a/lib/gitlab/ci/features.rb +++ b/lib/gitlab/ci/features.rb @@ -83,6 +83,10 @@ module Gitlab def self.coverage_report_view?(project) ::Feature.enabled?(:coverage_report_view, project) end + + def self.expose_mr_description_predefined_variable? + ::Feature.enabled?(:ci_expose_mr_description_predefined_variable, default_enabled: true) + end end end end diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb index 55e717bdb16..f959a4accac 100644 --- a/lib/gitlab/usage_data.rb +++ b/lib/gitlab/usage_data.rb @@ -112,6 +112,7 @@ module Gitlab clusters_applications_cilium: count(::Clusters::Applications::Cilium.available), clusters_management_project: count(::Clusters::Cluster.with_management_project), kubernetes_agents: count(::Clusters::Agent), + kubernetes_agents_with_token: distinct_count(::Clusters::AgentToken, :agent_id), in_review_folder: count(::Environment.in_review_folder), grafana_integrated_projects: count(GrafanaIntegration.enabled), groups: count(Group), diff --git a/lib/gitlab/usage_data_counters/known_events.yml b/lib/gitlab/usage_data_counters/known_events.yml index 4d5910d2a41..dc9d025edcd 100644 --- a/lib/gitlab/usage_data_counters/known_events.yml +++ b/lib/gitlab/usage_data_counters/known_events.yml @@ -16,11 +16,6 @@ category: compliance redis_slot: compliance aggregation: weekly -- name: i_compliance_audit_events_api - category: compliance - redis_slot: compliance - expiry: 42 - aggregation: weekly # Analytics category - name: g_analytics_contribution category: analytics |