Add latest changes from gitlab-org/gitlab@master

6 files changed, 52 insertions, 23 deletions

diff --git a/app/assets/javascripts/analytics/cycle_analytics/mixins/filter_mixins.js b/app/assets/javascripts/analytics/cycle_analytics/mixins/filter_mixins.js
deleted file mode 100644
index ff8b4c56321..00000000000
--- a/app/assets/javascripts/analytics/cycle_analytics/mixins/filter_mixins.js
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js b/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js
index f609ca5f22d..4b35b7d360c 100644
--- a/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js
+++ b/app/assets/javascripts/cycle_analytics/cycle_analytics_bundle.js
@@ -2,7 +2,6 @@ import $ from 'jquery';
 import Vue from 'vue';
 import Cookies from 'js-cookie';
 import { GlEmptyState, GlLoadingIcon } from '@gitlab/ui';
-import filterMixins from 'ee_else_ce/analytics/cycle_analytics/mixins/filter_mixins';
 import Flash from '../flash';
 import { __ } from '~/locale';
 import Translate from '../vue_shared/translate';
@@ -45,7 +44,6 @@ export default () => {
         import('ee_component/analytics/shared/components/date_range_dropdown.vue'),
       'stage-nav-item': stageNavItem,
     },
-    mixins: [filterMixins],
     data() {
       return {
         store: CycleAnalyticsStore,
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index d180e64b8dd..fc3b786b365 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -673,11 +673,10 @@
       border-radius: 100%;
       display: block;
       padding: 0;
-      line-height: initial;
+      line-height: 0;
 
       svg {
         fill: $gl-text-color-secondary;
-        vertical-align: initial;
       }
 
       .spinner {
diff --git a/app/services/resource_events/base_change_timebox_service.rb b/app/services/resource_events/base_change_timebox_service.rb
new file mode 100644
index 00000000000..5c83f7b12f7
--- /dev/null
+++ b/app/services/resource_events/base_change_timebox_service.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module ResourceEvents
+  class BaseChangeTimeboxService
+    attr_reader :resource, :user, :event_created_at
+
+    def initialize(resource, user, created_at: Time.current)
+      @resource = resource
+      @user = user
+      @event_created_at = created_at
+    end
+
+    def execute
+      create_event
+
+      resource.expire_note_etag_cache
+    end
+
+    private
+
+    def create_event
+      raise NotImplementedError
+    end
+
+    def build_resource_args
+      key = resource.class.name.foreign_key
+
+      {
+        user_id: user.id,
+        created_at: event_created_at,
+        key => resource.id
+      }
+    end
+  end
+end
diff --git a/app/services/resource_events/change_milestone_service.rb b/app/services/resource_events/change_milestone_service.rb
index 82c3e2acad5..dcdf87599ac 100644
--- a/app/services/resource_events/change_milestone_service.rb
+++ b/app/services/resource_events/change_milestone_service.rb
@@ -1,37 +1,30 @@
 # frozen_string_literal: true
 
 module ResourceEvents
-  class ChangeMilestoneService
-    attr_reader :resource, :user, :event_created_at, :milestone, :old_milestone
+  class ChangeMilestoneService < BaseChangeTimeboxService
+    attr_reader :milestone, :old_milestone
 
     def initialize(resource, user, created_at: Time.current, old_milestone:)
-      @resource = resource
-      @user = user
-      @event_created_at = created_at
+      super(resource, user, created_at: created_at)
+
       @milestone = resource&.milestone
       @old_milestone = old_milestone
     end
 
-    def execute
-      ResourceMilestoneEvent.create(build_resource_args)
+    private
 
-      resource.expire_note_etag_cache
+    def create_event
+      ResourceMilestoneEvent.create(build_resource_args)
     end
 
-    private
-
     def build_resource_args
       action = milestone.blank? ? :remove : :add
-      key = resource.class.name.foreign_key
 
-      {
-        user_id: user.id,
-        created_at: event_created_at,
-        milestone_id: action == :add ? milestone&.id : old_milestone&.id,
+      super.merge({
         state: ResourceMilestoneEvent.states[resource.state],
-        action: ResourceMilestoneEvent.actions[action],
-        key => resource.id
-      }
+        action: ResourceTimeboxEvent.actions[action],
+        milestone_id: milestone.blank? ? old_milestone&.id : milestone&.id
+      })
     end
   end
 end
diff --git a/app/validators/json_schemas/security_ci_configuration_schemas/sast_ui_schema.json b/app/validators/json_schemas/security_ci_configuration_schemas/sast_ui_schema.json
index aa4dd60a9fb..995f2ad6616 100644
--- a/app/validators/json_schemas/security_ci_configuration_schemas/sast_ui_schema.json
+++ b/app/validators/json_schemas/security_ci_configuration_schemas/sast_ui_schema.json
@@ -6,6 +6,7 @@
             "type": "string",
             "default_value": "",
             "value": "",
+            "size": "MEDIUM",
             "description": "Analyzer image's registry prefix (or Name of the registry providing the analyzers' image)"
         },
         {
@@ -14,6 +15,7 @@
             "type": "string",
             "default_value": "",
             "value": "",
+            "size": "LARGE",
             "description": "Comma-separated list of paths to be excluded from analyzer output. Patterns can be globs, file paths, or folder paths."
         },
         {
@@ -22,6 +24,7 @@
             "type": "string",
             "default_value": "",
             "value": "",
+            "size": "SMALL",
             "description": "Analyzer image's tag"
         }
     ],
@@ -32,6 +35,7 @@
             "type": "string",
             "default_value": "",
             "value": "",
+            "size": "MEDIUM",
             "description": "Pipeline stage in which the scan jobs run"
         },
         {
@@ -40,6 +44,7 @@
             "type": "string",
             "default_value": "",
             "value": "",
+            "size": "SMALL",
             "description": "Maximum depth of language and framework detection"
         }
     ],