Add latest changes from gitlab-org/gitlab@master

3 files changed, 6 insertions, 8 deletions

diff --git a/lib/api/ci/pipelines.rb b/lib/api/ci/pipelines.rb
index bbbf3b683c5..a010e0dd761 100644
--- a/lib/api/ci/pipelines.rb
+++ b/lib/api/ci/pipelines.rb
@@ -110,15 +110,13 @@ module API
         end
 
         desc 'Gets the test report for a given pipeline' do
-          detail 'This feature was introduced in GitLab 13.0. Disabled by default behind feature flag `junit_pipeline_view`'
+          detail 'This feature was introduced in GitLab 13.0.'
           success TestReportEntity
         end
         params do
           requires :pipeline_id, type: Integer, desc: 'The pipeline ID'
         end
         get ':id/pipelines/:pipeline_id/test_report' do
-          not_found! unless Feature.enabled?(:junit_pipeline_view, user_project)
-
           authorize! :read_build, pipeline
 
           present pipeline.test_reports, with: TestReportEntity, details: true
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb
index ccfb7b3870f..db2aff9b25a 100644
--- a/lib/gitlab/usage_data.rb
+++ b/lib/gitlab/usage_data.rb
@@ -607,7 +607,7 @@ module Gitlab
         counter = Gitlab::UsageDataCounters::TrackUniqueActions
 
         project_count = redis_usage_data do
-          counter.count_unique_events(
+          counter.count_unique(
             event_action: Gitlab::UsageDataCounters::TrackUniqueActions::PUSH_ACTION,
             date_from: time_period[:created_at].first,
             date_to: time_period[:created_at].last
@@ -615,7 +615,7 @@ module Gitlab
         end
 
         design_count = redis_usage_data do
-          counter.count_unique_events(
+          counter.count_unique(
             event_action: Gitlab::UsageDataCounters::TrackUniqueActions::DESIGN_ACTION,
             date_from: time_period[:created_at].first,
             date_to: time_period[:created_at].last
@@ -623,7 +623,7 @@ module Gitlab
         end
 
         wiki_count = redis_usage_data do
-          counter.count_unique_events(
+          counter.count_unique(
             event_action: Gitlab::UsageDataCounters::TrackUniqueActions::WIKI_ACTION,
             date_from: time_period[:created_at].first,
             date_to: time_period[:created_at].last
diff --git a/lib/gitlab/usage_data_counters/track_unique_actions.rb b/lib/gitlab/usage_data_counters/track_unique_actions.rb
index 686cce8e0ac..b7948b07251 100644
--- a/lib/gitlab/usage_data_counters/track_unique_actions.rb
+++ b/lib/gitlab/usage_data_counters/track_unique_actions.rb
@@ -27,7 +27,7 @@ module Gitlab
       }).freeze
 
       class << self
-        def track_action(event_action:, event_target:, author_id:, time: Time.zone.now)
+        def track_event(event_action:, event_target:, author_id:, time: Time.zone.now)
           return unless Gitlab::CurrentSettings.usage_ping_enabled
           return unless Feature.enabled?(FEATURE_FLAG)
           return unless valid_target?(event_target)
@@ -40,7 +40,7 @@ module Gitlab
           Gitlab::Redis::HLL.add(key: target_key, value: author_id, expiry: KEY_EXPIRY_LENGTH)
         end
 
-        def count_unique_events(event_action:, date_from:, date_to:)
+        def count_unique(event_action:, date_from:, date_to:)
           keys = (date_from.to_date..date_to.to_date).map { |date| key(event_action, date) }
 
           Gitlab::Redis::HLL.count(keys: keys)