Automatic merge of gitlab-org/gitlab master

config/metrics/counts_all/20210216180754_events.yml

 ---
 data_category: Optional
 key_path: usage_activity_by_stage.manage.events
-description:
+description: Number of distinct users who have generated a manage event
 product_section: dev
-product_stage:
+product_stage: manage
 product_group: group::manage
 product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

doc/development/usage_ping/dictionary.md

@@ -19374,7 +19374,7 @@ Tiers: `premium`, `ultimate`
 
 ### `usage_activity_by_stage.manage.events`
 
-Missing description
+Number of distinct users who have generated a manage event
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216180754_events.yml)
 
@@ -19384,7 +19384,7 @@ Data Category: `Optional`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage.manage.group_imports.gitlab_migration`
 
@@ -19920,17 +19920,17 @@ Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage.manage.projects_with_compliance_framework`
 
-Number of projects labeled with a compliance framework label [see](https://gitlab.com/gitlab-org/gitlab/-/issues/118671)
+Number of projects labeled with a compliance framework label
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_all/20210216180805_projects_with_compliance_framework.yml)
 
-Group: `group::manage`
+Group: `group::compliance`
 
 Data Category: `Optional`
 
 Status: `data_available`
 
-Tiers:
+Tiers: `premium`, `ultimate`
 
 ### `usage_activity_by_stage.manage.unique_users_all_imports`
 
@@ -22344,17 +22344,17 @@ Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage_monthly.manage.projects_with_compliance_framework`
 
-Missing description
+Number of projects labeled with a compliance framework label
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_28d/20210216180825_projects_with_compliance_framework.yml)
 
-Group: `group::manage`
+Group: `group::compliance`
 
 Data Category: `Optional`
 
 Status: `data_available`
 
-Tiers:
+Tiers: `premium`, `ultimate`
 
 ### `usage_activity_by_stage_monthly.manage.unique_users_all_imports`
 

ee/config/metrics/counts_28d/20210216180825_projects_with_compliance_framework.yml

 ---
 data_category: Optional
 key_path: usage_activity_by_stage_monthly.manage.projects_with_compliance_framework
-description:
+description: Number of projects labeled with a compliance framework label
 product_section: dev
-product_stage:
-product_group: group::manage
-product_category:
+product_stage: manage
+product_group: group::compliance
+product_category: compliance_management
 value_type: number
 status: data_available
-time_frame: 28d
-data_source:
+time_frame: all
+data_source: database
 distribution:
 - ee
-tier: []
-skip_validation: true
+tier:
+- premium
+- ultimate
\ No newline at end of file

ee/config/metrics/counts_all/20210216180805_projects_with_compliance_framework.yml

 ---
 data_category: Optional
 key_path: usage_activity_by_stage.manage.projects_with_compliance_framework
-description: Number of projects labeled with a compliance framework label [see](https://gitlab.com/gitlab-org/gitlab/-/issues/118671)
+description: Number of projects labeled with a compliance framework label
 product_section: dev
-product_stage:
-product_group: group::manage
-product_category:
+product_stage: manage
+product_group: group::compliance
+product_category: compliance_management
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ee
-tier: []
-skip_validation: true
+tier:
+- premium
+- ultimate

ee/spec/models/vulnerabilities/feedback_spec.rb

@@ -62,7 +62,7 @@ RSpec.describe Vulnerabilities::Feedback do
       let(:feedback) { build(:vulnerability_feedback, project: project, pipeline: pipeline) }
 
       it 'is invalid' do
-        expect(feedback.project_id).not_to eq(feedback.pipeline_id)
+        expect(feedback.project_id).not_to eq(pipeline.project_id)
         expect(feedback).not_to be_valid
       end
     end

spec/models/hooks/web_hook_spec.rb

@@ -289,7 +289,7 @@ RSpec.describe WebHook do
       expect { hook.enable! }.to change(hook, :executable?).from(false).to(true)
     end
 
-    it 'does not update hooks unless necessary', :aggregate_failures do
+    it 'does not update hooks unless necessary' do
       sql_count = ActiveRecord::QueryRecorder.new { hook.enable! }.count
 
       expect(sql_count).to eq(0)
@@ -331,11 +331,12 @@ RSpec.describe WebHook do
       expect { hook.failed! }.to change(hook, :recent_failures).by(1)
     end
 
-    it 'does not allow the failure count to exceed the maximum value', :aggregate_failures do
+    it 'does not update the hook if the the failure count exceeds the maximum value' do
       hook.recent_failures = described_class::MAX_FAILURES
 
-      expect { hook.failed! }.not_to change(hook, :recent_failures)
-      expect(hook).not_to be_persisted
+      sql_count = ActiveRecord::QueryRecorder.new { hook.failed! }.count
+
+      expect(sql_count).to eq(0)
     end
 
     include_examples 'is tolerant of invalid records' do