Add latest changes from gitlab-org/gitlab@master

6 files changed, 1 insertions, 33 deletions

diff --git a/lib/gitlab/markdown_cache.rb b/lib/gitlab/markdown_cache.rb
index 283502d90c1..09ba95666de 100644
--- a/lib/gitlab/markdown_cache.rb
+++ b/lib/gitlab/markdown_cache.rb
@@ -11,7 +11,7 @@ module Gitlab
     # this if the change to the renderer output is a new feature or a
     # minor bug fix.
     # See: https://gitlab.com/gitlab-org/gitlab/-/issues/330313
-    CACHE_COMMONMARK_VERSION       = 30
+    CACHE_COMMONMARK_VERSION       = 31
     CACHE_COMMONMARK_VERSION_START = 10
 
     BaseError = Class.new(StandardError)
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb
index c65bd197a14..7934cc27808 100644
--- a/lib/gitlab/usage_data.rb
+++ b/lib/gitlab/usage_data.rb
@@ -754,7 +754,6 @@ module Gitlab
           action_monthly_active_users_web_ide_edit: redis_usage_data { counter.count_web_ide_edit_actions(**date_range) },
           action_monthly_active_users_sfe_edit: redis_usage_data { counter.count_sfe_edit_actions(**date_range) },
           action_monthly_active_users_snippet_editor_edit: redis_usage_data { counter.count_snippet_editor_edit_actions(**date_range) },
-          action_monthly_active_users_sse_edit: redis_usage_data { counter.count_sse_edit_actions(**date_range) },
           action_monthly_active_users_ide_edit: redis_usage_data { counter.count_edit_using_editor(**date_range) }
         }
       end
diff --git a/lib/gitlab/usage_data_counters.rb b/lib/gitlab/usage_data_counters.rb
index cdcad8fdc7b..2a3dcf267c6 100644
--- a/lib/gitlab/usage_data_counters.rb
+++ b/lib/gitlab/usage_data_counters.rb
@@ -15,7 +15,6 @@ module Gitlab
       MergeRequestCounter,
       DesignsCounter,
       KubernetesAgentCounter,
-      StaticSiteEditorCounter,
       DiffsCounter,
       ServiceUsageDataCounter
     ].freeze
diff --git a/lib/gitlab/usage_data_counters/editor_unique_counter.rb b/lib/gitlab/usage_data_counters/editor_unique_counter.rb
index f97ebdccecf..8feb24e49ac 100644
--- a/lib/gitlab/usage_data_counters/editor_unique_counter.rb
+++ b/lib/gitlab/usage_data_counters/editor_unique_counter.rb
@@ -6,7 +6,6 @@ module Gitlab
       EDIT_BY_SNIPPET_EDITOR = 'g_edit_by_snippet_ide'
       EDIT_BY_SFE = 'g_edit_by_sfe'
       EDIT_BY_WEB_IDE = 'g_edit_by_web_ide'
-      EDIT_BY_SSE = 'g_edit_by_sse'
       EDIT_CATEGORY = 'ide_edit'
       EDIT_BY_LIVE_PREVIEW = 'g_edit_by_live_preview'
 
@@ -40,14 +39,6 @@ module Gitlab
           count_unique(events, date_from, date_to)
         end
 
-        def track_sse_edit_action(author:, time: Time.zone.now)
-          track_unique_action(EDIT_BY_SSE, author, time)
-        end
-
-        def count_sse_edit_actions(date_from:, date_to:)
-          count_unique(EDIT_BY_SSE, date_from, date_to)
-        end
-
         def track_live_preview_edit_action(author:, time: Time.zone.now)
           track_unique_action(EDIT_BY_LIVE_PREVIEW, author, time)
         end
diff --git a/lib/gitlab/usage_data_counters/known_events/common.yml b/lib/gitlab/usage_data_counters/known_events/common.yml
index 448ed4c66e1..65f1f4b08fd 100644
--- a/lib/gitlab/usage_data_counters/known_events/common.yml
+++ b/lib/gitlab/usage_data_counters/known_events/common.yml
@@ -30,11 +30,6 @@
   redis_slot: edit
   expiry: 29
   aggregation: daily
-- name: g_edit_by_sse
-  category: ide_edit
-  redis_slot: edit
-  expiry: 29
-  aggregation: daily
 - name: g_edit_by_snippet_ide
   category: ide_edit
   redis_slot: edit
diff --git a/lib/gitlab/usage_data_counters/static_site_editor_counter.rb b/lib/gitlab/usage_data_counters/static_site_editor_counter.rb
deleted file mode 100644
index 3c5989d1e11..00000000000
--- a/lib/gitlab/usage_data_counters/static_site_editor_counter.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module UsageDataCounters
-    class StaticSiteEditorCounter < BaseCounter
-      KNOWN_EVENTS = %w[views commits merge_requests].freeze
-      PREFIX = 'static_site_editor'
-
-      class << self
-        def increment_views_count
-          count(:views)
-        end
-      end
-    end
-  end
-end