Add latest changes from gitlab-org/gitlab@master

3 files changed, 184 insertions, 76 deletions

diff --git a/lib/gitlab/background_migration/populate_resolved_on_default_branch_column.rb b/lib/gitlab/background_migration/populate_resolved_on_default_branch_column.rb
new file mode 100644
index 00000000000..eb72ef1de33
--- /dev/null
+++ b/lib/gitlab/background_migration/populate_resolved_on_default_branch_column.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    # rubocop:disable Style/Documentation
+    class PopulateResolvedOnDefaultBranchColumn
+      def perform(*); end
+    end
+  end
+end
+
+Gitlab::BackgroundMigration::PopulateResolvedOnDefaultBranchColumn.prepend_if_ee('EE::Gitlab::BackgroundMigration::PopulateResolvedOnDefaultBranchColumn')
diff --git a/lib/gitlab/ci/ansi2html.rb b/lib/gitlab/ci/ansi2html.rb
index e145bd2e9df..1fac00337a3 100644
--- a/lib/gitlab/ci/ansi2html.rb
+++ b/lib/gitlab/ci/ansi2html.rb
@@ -31,105 +31,205 @@ module Gitlab
       end
 
       class Converter
-        def on_0(_) reset                              end
+        def on_0(_)
+          reset
+        end
 
-        def on_1(_) enable(STYLE_SWITCHES[:bold])      end
+        def on_1(_)
+          enable(STYLE_SWITCHES[:bold])
+        end
 
-        def on_3(_) enable(STYLE_SWITCHES[:italic])    end
+        def on_3(_)
+          enable(STYLE_SWITCHES[:italic])
+        end
 
-        def on_4(_) enable(STYLE_SWITCHES[:underline]) end
+        def on_4(_)
+          enable(STYLE_SWITCHES[:underline])
+        end
 
-        def on_8(_) enable(STYLE_SWITCHES[:conceal])   end
+        def on_8(_)
+          enable(STYLE_SWITCHES[:conceal])
+        end
 
-        def on_9(_) enable(STYLE_SWITCHES[:cross])     end
+        def on_9(_)
+          enable(STYLE_SWITCHES[:cross])
+        end
 
-        def on_21(_) disable(STYLE_SWITCHES[:bold])      end
+        def on_21(_)
+          disable(STYLE_SWITCHES[:bold])
+        end
 
-        def on_22(_) disable(STYLE_SWITCHES[:bold])      end
+        def on_22(_)
+          disable(STYLE_SWITCHES[:bold])
+        end
 
-        def on_23(_) disable(STYLE_SWITCHES[:italic])    end
+        def on_23(_)
+          disable(STYLE_SWITCHES[:italic])
+        end
 
-        def on_24(_) disable(STYLE_SWITCHES[:underline]) end
+        def on_24(_)
+          disable(STYLE_SWITCHES[:underline])
+        end
 
-        def on_28(_) disable(STYLE_SWITCHES[:conceal])   end
+        def on_28(_)
+          disable(STYLE_SWITCHES[:conceal])
+        end
 
-        def on_29(_) disable(STYLE_SWITCHES[:cross])     end
+        def on_29(_)
+          disable(STYLE_SWITCHES[:cross])
+        end
 
-        def on_30(_) set_fg_color(0) end
+        def on_30(_)
+          set_fg_color(0)
+        end
 
-        def on_31(_) set_fg_color(1) end
+        def on_31(_)
+          set_fg_color(1)
+        end
 
-        def on_32(_) set_fg_color(2) end
+        def on_32(_)
+          set_fg_color(2)
+        end
 
-        def on_33(_) set_fg_color(3) end
+        def on_33(_)
+          set_fg_color(3)
+        end
 
-        def on_34(_) set_fg_color(4) end
+        def on_34(_)
+          set_fg_color(4)
+        end
 
-        def on_35(_) set_fg_color(5) end
+        def on_35(_)
+          set_fg_color(5)
+        end
 
-        def on_36(_) set_fg_color(6) end
+        def on_36(_)
+          set_fg_color(6)
+        end
 
-        def on_37(_) set_fg_color(7) end
+        def on_37(_)
+          set_fg_color(7)
+        end
 
-        def on_38(stack) set_fg_color_256(stack) end
+        def on_38(stack)
+          set_fg_color_256(stack)
+        end
 
-        def on_39(_) set_fg_color(9) end
+        def on_39(_)
+          set_fg_color(9)
+        end
 
-        def on_40(_) set_bg_color(0) end
+        def on_40(_)
+          set_bg_color(0)
+        end
 
-        def on_41(_) set_bg_color(1) end
+        def on_41(_)
+          set_bg_color(1)
+        end
 
-        def on_42(_) set_bg_color(2) end
+        def on_42(_)
+          set_bg_color(2)
+        end
 
-        def on_43(_) set_bg_color(3) end
+        def on_43(_)
+          set_bg_color(3)
+        end
 
-        def on_44(_) set_bg_color(4) end
+        def on_44(_)
+          set_bg_color(4)
+        end
 
-        def on_45(_) set_bg_color(5) end
+        def on_45(_)
+          set_bg_color(5)
+        end
 
-        def on_46(_) set_bg_color(6) end
+        def on_46(_)
+          set_bg_color(6)
+        end
 
-        def on_47(_) set_bg_color(7) end
+        def on_47(_)
+          set_bg_color(7)
+        end
 
-        def on_48(stack) set_bg_color_256(stack) end
+        def on_48(stack)
+          set_bg_color_256(stack)
+        end
 
-        def on_49(_) set_bg_color(9) end
+        def on_49(_)
+          set_bg_color(9)
+        end
 
-        def on_90(_) set_fg_color(0, 'l') end
+        def on_90(_)
+          set_fg_color(0, 'l')
+        end
 
-        def on_91(_) set_fg_color(1, 'l') end
+        def on_91(_)
+          set_fg_color(1, 'l')
+        end
 
-        def on_92(_) set_fg_color(2, 'l') end
+        def on_92(_)
+          set_fg_color(2, 'l')
+        end
 
-        def on_93(_) set_fg_color(3, 'l') end
+        def on_93(_)
+          set_fg_color(3, 'l')
+        end
 
-        def on_94(_) set_fg_color(4, 'l') end
+        def on_94(_)
+          set_fg_color(4, 'l')
+        end
 
-        def on_95(_) set_fg_color(5, 'l') end
+        def on_95(_)
+          set_fg_color(5, 'l')
+        end
 
-        def on_96(_) set_fg_color(6, 'l') end
+        def on_96(_)
+          set_fg_color(6, 'l')
+        end
 
-        def on_97(_) set_fg_color(7, 'l') end
+        def on_97(_)
+          set_fg_color(7, 'l')
+        end
 
-        def on_99(_) set_fg_color(9, 'l') end
+        def on_99(_)
+          set_fg_color(9, 'l')
+        end
 
-        def on_100(_) set_bg_color(0, 'l') end
+        def on_100(_)
+          set_bg_color(0, 'l')
+        end
 
-        def on_101(_) set_bg_color(1, 'l') end
+        def on_101(_)
+          set_bg_color(1, 'l')
+        end
 
-        def on_102(_) set_bg_color(2, 'l') end
+        def on_102(_)
+          set_bg_color(2, 'l')
+        end
 
-        def on_103(_) set_bg_color(3, 'l') end
+        def on_103(_)
+          set_bg_color(3, 'l')
+        end
 
-        def on_104(_) set_bg_color(4, 'l') end
+        def on_104(_)
+          set_bg_color(4, 'l')
+        end
 
-        def on_105(_) set_bg_color(5, 'l') end
+        def on_105(_)
+          set_bg_color(5, 'l')
+        end
 
-        def on_106(_) set_bg_color(6, 'l') end
+        def on_106(_)
+          set_bg_color(6, 'l')
+        end
 
-        def on_107(_) set_bg_color(7, 'l') end
+        def on_107(_)
+          set_bg_color(7, 'l')
+        end
 
-        def on_109(_) set_bg_color(9, 'l') end
+        def on_109(_)
+          set_bg_color(9, 'l')
+        end
 
         attr_accessor :offset, :n_open_tags, :fg_color, :bg_color, :style_mask, :sections, :lineno_in_section
 
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb
index b2c296cc3d5..22c344a27f7 100644
--- a/lib/gitlab/usage_data.rb
+++ b/lib/gitlab/usage_data.rb
@@ -650,41 +650,37 @@ module Gitlab
       end
 
       def action_monthly_active_users(time_period)
-        counter = Gitlab::UsageDataCounters::TrackUniqueEvents
+        date_range = { date_from: time_period[:created_at].first, date_to: time_period[:created_at].last }
 
-        project_count = redis_usage_data do
-          counter.count_unique_events(
-            event_action: Gitlab::UsageDataCounters::TrackUniqueEvents::PUSH_ACTION,
-            date_from: time_period[:created_at].first,
-            date_to: time_period[:created_at].last
-          )
-        end
+        event_monthly_active_users(date_range)
+          .merge!(ide_monthly_active_users(date_range))
+      end
 
-        design_count = redis_usage_data do
-          counter.count_unique_events(
-            event_action: Gitlab::UsageDataCounters::TrackUniqueEvents::DESIGN_ACTION,
-            date_from: time_period[:created_at].first,
-            date_to: time_period[:created_at].last
-          )
-        end
+      private
 
-        wiki_count = redis_usage_data do
-          counter.count_unique_events(
-            event_action: Gitlab::UsageDataCounters::TrackUniqueEvents::WIKI_ACTION,
-            date_from: time_period[:created_at].first,
-            date_to: time_period[:created_at].last
-          )
+      def event_monthly_active_users(date_range)
+        data = {
+          action_monthly_active_users_project_repo: Gitlab::UsageDataCounters::TrackUniqueEvents::PUSH_ACTION,
+          action_monthly_active_users_design_management: Gitlab::UsageDataCounters::TrackUniqueEvents::DESIGN_ACTION,
+          action_monthly_active_users_wiki_repo: Gitlab::UsageDataCounters::TrackUniqueEvents::WIKI_ACTION
+        }
+
+        data.each do |key, event|
+          data[key] = redis_usage_data { Gitlab::UsageDataCounters::TrackUniqueEvents.count_unique_events(event_action: event, **date_range) }
         end
+      end
+
+      def ide_monthly_active_users(date_range)
+        counter = Gitlab::UsageDataCounters::EditorUniqueCounter
 
         {
-          action_monthly_active_users_project_repo: project_count,
-          action_monthly_active_users_design_management: design_count,
-          action_monthly_active_users_wiki_repo: wiki_count
+          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_ide_edit: redis_usage_data { counter.count_edit_using_editor(date_range) }
         }
       end
 
-      private
-
       def distinct_count_service_desk_enabled_projects(time_period)
         project_creator_id_start = user_minimum_id
         project_creator_id_finish = user_maximum_id