Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

2 files changed, 11 insertions, 1 deletions

diff --git a/app/helpers/analytics/cycle_analytics_helper.rb b/app/helpers/analytics/cycle_analytics_helper.rb
new file mode 100644
index 00000000000..c43ac545bf8
--- /dev/null
+++ b/app/helpers/analytics/cycle_analytics_helper.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Analytics
+  module CycleAnalyticsHelper
+    def cycle_analytics_default_stage_config
+      Gitlab::Analytics::CycleAnalytics::DefaultStages.all.map do |stage_params|
+        Analytics::CycleAnalytics::StagePresenter.new(stage_params)
+      end
+    end
+  end
+end
diff --git a/app/helpers/analytics/unique_visits_helper.rb b/app/helpers/analytics/unique_visits_helper.rb
index 4c709b2ed23..337a5dc9536 100644
--- a/app/helpers/analytics/unique_visits_helper.rb
+++ b/app/helpers/analytics/unique_visits_helper.rb
@@ -14,7 +14,6 @@ module Analytics
     end
 
     def track_visit(target_id)
-      return unless Feature.enabled?(:track_unique_visits, default_enabled: true)
       return unless visitor_id
 
       Gitlab::Analytics::UniqueVisits.new.track_visit(visitor_id, target_id)