Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 3 deletions

diff --git a/spec/lib/gitlab/usage_data_counters/ci_template_unique_counter_spec.rb b/spec/lib/gitlab/usage_data_counters/ci_template_unique_counter_spec.rb
index f1115a8813d..11c6ea2fc9d 100644
--- a/spec/lib/gitlab/usage_data_counters/ci_template_unique_counter_spec.rb
+++ b/spec/lib/gitlab/usage_data_counters/ci_template_unique_counter_spec.rb
@@ -30,7 +30,6 @@ RSpec.describe Gitlab::UsageDataCounters::CiTemplateUniqueCounter do
       end
 
       it_behaves_like 'Snowplow event tracking with RedisHLL context' do
-        let(:feature_flag_name) { :route_hll_to_snowplow }
         let(:category) { described_class.to_s }
         let(:action) { 'ci_templates_unique' }
         let(:namespace) { project.namespace }
diff --git a/spec/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter_spec.rb b/spec/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter_spec.rb
index 9a1ffd8d01d..42aa84c2c3e 100644
--- a/spec/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter_spec.rb
+++ b/spec/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter_spec.rb
@@ -70,8 +70,8 @@ RSpec.describe Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter, :cl
       let(:namespace) { project.namespace.reload }
       let(:user) { project.creator }
       let(:feature_flag_name) { :route_hll_to_snowplow_phase2 }
-      let(:label) { 'redis_hll_counters.code_review.i_code_review_create_mr_monthly' }
-      let(:property) { described_class::MR_CREATE_ACTION }
+      let(:label) { 'redis_hll_counters.code_review.i_code_review_user_create_mr_monthly' }
+      let(:property) { described_class::MR_USER_CREATE_ACTION }
     end
   end