diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-01-31 14:26:24 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-01-31 14:26:24 +0000 |
| commit | aa4cb47479b3065d24d4353f96ca82040c867a55 (patch) | |
| tree | e08e38ab27bd624c373f12485101d5d72971912b | |
| parent | ef3a0a6a24b86922b5156973f348cb55ffcbbcbe (diff) | |
| parent | 232a7a36e2e8e6235a94da767ca96b3277b8590d (diff) | |
| download | gitlab-ce-48742-reword-could-not-connect-to-the-ci-server-please-check-your-settings-and-try-again.tar.gz | |
Merge branch '45791-number-of-repositories-usage-ping' into 'master'48742-reword-could-not-connect-to-the-ci-server-please-check-your-settings-and-try-again
Add number of repositories to usage ping data
Closes #45791
See merge request gitlab-org/gitlab-ce!24823
| -rw-r--r-- | changelogs/unreleased/45791-number-of-repositories-usage-ping.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/usage_data.rb | 1 | ||||
| -rw-r--r-- | spec/lib/gitlab/usage_data_spec.rb | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/45791-number-of-repositories-usage-ping.yml b/changelogs/unreleased/45791-number-of-repositories-usage-ping.yml new file mode 100644 index 00000000000..8d1f5df56ea --- /dev/null +++ b/changelogs/unreleased/45791-number-of-repositories-usage-ping.yml @@ -0,0 +1,5 @@ +--- +title: Add repositories count to usage ping data +merge_request: 24823 +author: +type: added diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb index 083c620267a..6bfcf83f388 100644 --- a/lib/gitlab/usage_data.rb +++ b/lib/gitlab/usage_data.rb @@ -81,6 +81,7 @@ module Gitlab pages_domains: count(PagesDomain), projects: count(Project), projects_imported_from_github: count(Project.where(import_type: 'github')), + projects_with_repositories_enabled: count(ProjectFeature.where('repository_access_level > ?', ProjectFeature::DISABLED)), protected_branches: count(ProtectedBranch), releases: count(Release), remote_mirrors: count(RemoteMirror), diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb index 2a09f581f68..4f5993ba226 100644 --- a/spec/lib/gitlab/usage_data_spec.rb +++ b/spec/lib/gitlab/usage_data_spec.rb @@ -26,6 +26,8 @@ describe Gitlab::UsageData do create(:clusters_applications_prometheus, :installed, cluster: gcp_cluster) create(:clusters_applications_runner, :installed, cluster: gcp_cluster) create(:clusters_applications_knative, :installed, cluster: gcp_cluster) + + ProjectFeature.first.update_attribute('repository_access_level', 0) end subject { described_class.data } @@ -112,6 +114,7 @@ describe Gitlab::UsageData do projects_slack_notifications_active projects_slack_slash_active projects_prometheus_active + projects_with_repositories_enabled pages_domains protected_branches releases @@ -134,6 +137,7 @@ describe Gitlab::UsageData do expect(count_data[:projects_jira_cloud_active]).to eq(1) expect(count_data[:projects_slack_notifications_active]).to eq(2) expect(count_data[:projects_slack_slash_active]).to eq(1) + expect(count_data[:projects_with_repositories_enabled]).to eq(2) expect(count_data[:clusters_enabled]).to eq(7) expect(count_data[:project_clusters_enabled]).to eq(6) |