Add latest changes from gitlab-org/gitlab@master

12 files changed, 25 insertions, 25 deletions

diff --git a/lib/gitlab/ci/status/build/canceled.rb b/lib/gitlab/ci/status/build/canceled.rb
index 0518b9e673d..dbdf45aedeb 100644
--- a/lib/gitlab/ci/status/build/canceled.rb
+++ b/lib/gitlab/ci/status/build/canceled.rb
@@ -7,8 +7,8 @@ module Gitlab
         class Canceled < Status::Extended
           def illustration
             {
-              image: 'illustrations/canceled-job_empty.svg',
-              size: 'svg-430',
+              image: 'illustrations/empty-state/empty-job-canceled-md.svg',
+              size: '',
               title: _('This job has been canceled')
             }
           end
diff --git a/lib/gitlab/ci/status/build/common.rb b/lib/gitlab/ci/status/build/common.rb
index 6a75ec5c37f..78d84e2d058 100644
--- a/lib/gitlab/ci/status/build/common.rb
+++ b/lib/gitlab/ci/status/build/common.rb
@@ -7,8 +7,8 @@ module Gitlab
         module Common
           def illustration
             {
-              image: 'illustrations/skipped-job_empty.svg',
-              size: 'svg-430',
+              image: 'illustrations/empty-state/empty-job-skipped-md.svg',
+              size: '',
               title: _('This job does not have a trace.')
             }
           end
diff --git a/lib/gitlab/ci/status/build/created.rb b/lib/gitlab/ci/status/build/created.rb
index 780fea23123..92485392136 100644
--- a/lib/gitlab/ci/status/build/created.rb
+++ b/lib/gitlab/ci/status/build/created.rb
@@ -7,8 +7,8 @@ module Gitlab
         class Created < Status::Extended
           def illustration
             {
-              image: 'illustrations/job_not_triggered.svg',
-              size: 'svg-306',
+              image: 'illustrations/empty-state/empty-job-not-triggered-md.svg',
+              size: '',
               title: _('This job has not been triggered yet'),
               content: _('This job depends on upstream jobs that need to succeed in order for this job to be triggered')
             }
diff --git a/lib/gitlab/ci/status/build/erased.rb b/lib/gitlab/ci/status/build/erased.rb
index c3430b8cc1c..a78bc308d87 100644
--- a/lib/gitlab/ci/status/build/erased.rb
+++ b/lib/gitlab/ci/status/build/erased.rb
@@ -8,7 +8,7 @@ module Gitlab
           def illustration
             {
               image: 'illustrations/empty-state/empty-projects-deleted-md.svg',
-              size: 'svg-150',
+              size: '',
               title: _('Job has been erased')
             }
           end
diff --git a/lib/gitlab/ci/status/build/failed_unmet_prerequisites.rb b/lib/gitlab/ci/status/build/failed_unmet_prerequisites.rb
index eaad3969a4c..e82c8050be7 100644
--- a/lib/gitlab/ci/status/build/failed_unmet_prerequisites.rb
+++ b/lib/gitlab/ci/status/build/failed_unmet_prerequisites.rb
@@ -8,7 +8,7 @@ module Gitlab
           def illustration
             {
               image: 'illustrations/pipelines_failed.svg',
-              size: 'svg-430',
+              size: 'svg-content svg-430',
               title: _('Failed to create resources'),
               content: _('Retry this job in order to create the necessary resources.')
             }
diff --git a/lib/gitlab/ci/status/build/manual.rb b/lib/gitlab/ci/status/build/manual.rb
index 5e77db3d336..39ae0d53b5f 100644
--- a/lib/gitlab/ci/status/build/manual.rb
+++ b/lib/gitlab/ci/status/build/manual.rb
@@ -12,7 +12,7 @@ module Gitlab
           def illustration
             {
               image: 'illustrations/manual_action.svg',
-              size: 'svg-394',
+              size: 'svg-content svg-394',
               title: _('This job requires a manual action'),
               content: illustration_content
             }
diff --git a/lib/gitlab/ci/status/build/pending.rb b/lib/gitlab/ci/status/build/pending.rb
index 95f668295dd..c520a6722b2 100644
--- a/lib/gitlab/ci/status/build/pending.rb
+++ b/lib/gitlab/ci/status/build/pending.rb
@@ -7,8 +7,8 @@ module Gitlab
         class Pending < Status::Extended
           def illustration
             {
-              image: 'illustrations/pending_job_empty.svg',
-              size: 'svg-430',
+              image: 'illustrations/empty-state/empty-job-pending-md.svg',
+              size: '',
               title: _('This job has not started yet'),
               content: _('This job is in pending state and is waiting to be picked by a runner')
             }
diff --git a/lib/gitlab/ci/status/build/preparing.rb b/lib/gitlab/ci/status/build/preparing.rb
index 1fddcb05f79..6ed40c77934 100644
--- a/lib/gitlab/ci/status/build/preparing.rb
+++ b/lib/gitlab/ci/status/build/preparing.rb
@@ -11,8 +11,8 @@ module Gitlab
           #
           def illustration
             {
-              image: 'illustrations/job_not_triggered.svg',
-              size: 'svg-306',
+              image: 'illustrations/empty-state/empty-job-not-triggered-md.svg',
+              size: '',
               title: _('This job is preparing to start'),
               content: _('This job is performing tasks that must complete before it can start')
             }
diff --git a/lib/gitlab/ci/status/build/scheduled.rb b/lib/gitlab/ci/status/build/scheduled.rb
index 0a09dbe5f42..7eca3db525a 100644
--- a/lib/gitlab/ci/status/build/scheduled.rb
+++ b/lib/gitlab/ci/status/build/scheduled.rb
@@ -7,8 +7,8 @@ module Gitlab
         class Scheduled < Status::Extended
           def illustration
             {
-              image: 'illustrations/illustrations_scheduled-job_countdown.svg',
-              size: 'svg-394',
+              image: 'illustrations/empty-state/empty-job-scheduled-md.svg',
+              size: '',
               title: _("This is a delayed job to run in %{remainingTime}"),
               content: _("This job will automatically run after its timer finishes. " \
                          "Often they are used for incremental roll-out deploys " \
diff --git a/lib/gitlab/ci/status/build/skipped.rb b/lib/gitlab/ci/status/build/skipped.rb
index 4fe2f7b3114..9142df3901f 100644
--- a/lib/gitlab/ci/status/build/skipped.rb
+++ b/lib/gitlab/ci/status/build/skipped.rb
@@ -7,8 +7,8 @@ module Gitlab
         class Skipped < Status::Extended
           def illustration
             {
-              image: 'illustrations/skipped-job_empty.svg',
-              size: 'svg-430',
+              image: 'illustrations/empty-state/empty-job-skipped-md.svg',
+              size: '',
               title: _('This job has been skipped')
             }
           end
diff --git a/lib/gitlab/ci/status/processable/waiting_for_resource.rb b/lib/gitlab/ci/status/processable/waiting_for_resource.rb
index ac82c99b5f1..2cf25c10648 100644
--- a/lib/gitlab/ci/status/processable/waiting_for_resource.rb
+++ b/lib/gitlab/ci/status/processable/waiting_for_resource.rb
@@ -11,8 +11,8 @@ module Gitlab
           #
           def illustration
             {
-              image: 'illustrations/pending_job_empty.svg',
-              size: 'svg-430',
+              image: 'illustrations/empty-state/empty-job-pending-md.svg',
+              size: '',
               title: _('This job is waiting for resource: ') + subject.resource_group.key
             }
           end
diff --git a/lib/gitlab/internal_events.rb b/lib/gitlab/internal_events.rb
index eb2ba3449fb..12609e9be35 100644
--- a/lib/gitlab/internal_events.rb
+++ b/lib/gitlab/internal_events.rb
@@ -10,7 +10,7 @@ module Gitlab
       include Gitlab::Tracking::Helpers
       include Gitlab::Utils::StrongMemoize
 
-      def track_event(event_name, send_snowplow_event: true, **kwargs)
+      def track_event(event_name, category: nil, send_snowplow_event: true, **kwargs)
         raise UnknownEventError, "Unknown event: #{event_name}" unless EventDefinitions.known_event?(event_name)
 
         validate_property!(kwargs, :user, User)
@@ -23,7 +23,7 @@ module Gitlab
         increase_total_counter(event_name)
         increase_weekly_total_counter(event_name)
         update_unique_counter(event_name, kwargs)
-        trigger_snowplow_event(event_name, kwargs) if send_snowplow_event
+        trigger_snowplow_event(event_name, category, kwargs) if send_snowplow_event
 
         if Feature.enabled?(:internal_events_for_product_analytics)
           send_application_instrumentation_event(event_name, kwargs)
@@ -76,7 +76,7 @@ module Gitlab
         UsageDataCounters::HLLRedisCounter.track_event(event_name, values: unique_value)
       end
 
-      def trigger_snowplow_event(event_name, kwargs)
+      def trigger_snowplow_event(event_name, category, kwargs)
         user = kwargs[:user]
         project = kwargs[:project]
         namespace = kwargs[:namespace]
@@ -93,11 +93,11 @@ module Gitlab
           event: event_name
         ).to_context
 
-        track_struct_event(event_name, contexts: [standard_context, service_ping_context])
+        track_struct_event(event_name, category, contexts: [standard_context, service_ping_context])
       end
 
-      def track_struct_event(event_name, contexts:)
-        category = 'InternalEventTracking'
+      def track_struct_event(event_name, category, contexts:)
+        category ||= 'InternalEventTracking'
         tracker = Gitlab::Tracking.tracker
         tracker.event(category, event_name, context: contexts)
       rescue StandardError => error