Add latest changes from gitlab-org/gitlab@16-5-stable-eev16.5.0-rc42

15 files changed, 27 insertions, 15 deletions

diff --git a/lib/gitlab/ci/status/canceled.rb b/lib/gitlab/ci/status/canceled.rb
index f173964b36c..a3376692570 100644
--- a/lib/gitlab/ci/status/canceled.rb
+++ b/lib/gitlab/ci/status/canceled.rb
@@ -5,7 +5,7 @@ module Gitlab
     module Status
       class Canceled < Status::Core
         def text
-          s_('CiStatusText|canceled')
+          s_('CiStatusText|Canceled')
         end
 
         def label
diff --git a/lib/gitlab/ci/status/core.rb b/lib/gitlab/ci/status/core.rb
index f60f5243666..c5306de830b 100644
--- a/lib/gitlab/ci/status/core.rb
+++ b/lib/gitlab/ci/status/core.rb
@@ -38,6 +38,10 @@ module Gitlab
           raise NotImplementedError
         end
 
+        def name
+          self.class.name.demodulize.underscore.upcase
+        end
+
         def group
           self.class.name.demodulize.underscore
         end
diff --git a/lib/gitlab/ci/status/created.rb b/lib/gitlab/ci/status/created.rb
index 33e67314d93..9ad4b2f079e 100644
--- a/lib/gitlab/ci/status/created.rb
+++ b/lib/gitlab/ci/status/created.rb
@@ -5,7 +5,7 @@ module Gitlab
     module Status
       class Created < Status::Core
         def text
-          s_('CiStatusText|created')
+          s_('CiStatusText|Created')
         end
 
         def label
diff --git a/lib/gitlab/ci/status/failed.rb b/lib/gitlab/ci/status/failed.rb
index 215d27734a7..cb498f72ffe 100644
--- a/lib/gitlab/ci/status/failed.rb
+++ b/lib/gitlab/ci/status/failed.rb
@@ -5,7 +5,7 @@ module Gitlab
     module Status
       class Failed < Status::Core
         def text
-          s_('CiStatusText|failed')
+          s_('CiStatusText|Failed')
         end
 
         def label
diff --git a/lib/gitlab/ci/status/manual.rb b/lib/gitlab/ci/status/manual.rb
index eb376df5f22..02e65dd1f4c 100644
--- a/lib/gitlab/ci/status/manual.rb
+++ b/lib/gitlab/ci/status/manual.rb
@@ -5,7 +5,7 @@ module Gitlab
     module Status
       class Manual < Status::Core
         def text
-          s_('CiStatusText|manual')
+          s_('CiStatusText|Manual')
         end
 
         def label
diff --git a/lib/gitlab/ci/status/pending.rb b/lib/gitlab/ci/status/pending.rb
index 4280ad84534..ddbdf94c089 100644
--- a/lib/gitlab/ci/status/pending.rb
+++ b/lib/gitlab/ci/status/pending.rb
@@ -5,7 +5,7 @@ module Gitlab
     module Status
       class Pending < Status::Core
         def text
-          s_('CiStatusText|pending')
+          s_('CiStatusText|Pending')
         end
 
         def label
diff --git a/lib/gitlab/ci/status/pipeline/blocked.rb b/lib/gitlab/ci/status/pipeline/blocked.rb
index ed13a439be0..2e01f4948a9 100644
--- a/lib/gitlab/ci/status/pipeline/blocked.rb
+++ b/lib/gitlab/ci/status/pipeline/blocked.rb
@@ -6,7 +6,7 @@ module Gitlab
       module Pipeline
         class Blocked < Status::Extended
           def text
-            s_('CiStatusText|blocked')
+            s_('CiStatusText|Blocked')
           end
 
           def label
diff --git a/lib/gitlab/ci/status/pipeline/delayed.rb b/lib/gitlab/ci/status/pipeline/delayed.rb
index e61acdcd167..47048afbe1d 100644
--- a/lib/gitlab/ci/status/pipeline/delayed.rb
+++ b/lib/gitlab/ci/status/pipeline/delayed.rb
@@ -6,7 +6,7 @@ module Gitlab
       module Pipeline
         class Delayed < Status::Extended
           def text
-            s_('CiStatusText|delayed')
+            s_('CiStatusText|Delayed')
           end
 
           def label
diff --git a/lib/gitlab/ci/status/preparing.rb b/lib/gitlab/ci/status/preparing.rb
index e59d1d2eed1..e29b5416e8d 100644
--- a/lib/gitlab/ci/status/preparing.rb
+++ b/lib/gitlab/ci/status/preparing.rb
@@ -5,7 +5,7 @@ module Gitlab
     module Status
       class Preparing < Status::Core
         def text
-          s_('CiStatusText|preparing')
+          s_('CiStatusText|Preparing')
         end
 
         def label
diff --git a/lib/gitlab/ci/status/running.rb b/lib/gitlab/ci/status/running.rb
index eed1983e60e..dc36e62e2a3 100644
--- a/lib/gitlab/ci/status/running.rb
+++ b/lib/gitlab/ci/status/running.rb
@@ -5,11 +5,11 @@ module Gitlab
     module Status
       class Running < Status::Core
         def text
-          s_('CiStatus|running')
+          s_('CiStatusText|Running')
         end
 
         def label
-          s_('CiStatus|running')
+          s_('CiStatusLabel|running')
         end
 
         def icon
diff --git a/lib/gitlab/ci/status/scheduled.rb b/lib/gitlab/ci/status/scheduled.rb
index 8526becfef9..a3797c5c8d7 100644
--- a/lib/gitlab/ci/status/scheduled.rb
+++ b/lib/gitlab/ci/status/scheduled.rb
@@ -5,7 +5,7 @@ module Gitlab
     module Status
       class Scheduled < Status::Core
         def text
-          s_('CiStatusText|scheduled')
+          s_('CiStatusText|Scheduled')
         end
 
         def label
diff --git a/lib/gitlab/ci/status/skipped.rb b/lib/gitlab/ci/status/skipped.rb
index 238aa3ab4f9..4263536552b 100644
--- a/lib/gitlab/ci/status/skipped.rb
+++ b/lib/gitlab/ci/status/skipped.rb
@@ -5,7 +5,7 @@ module Gitlab
     module Status
       class Skipped < Status::Core
         def text
-          s_('CiStatusText|skipped')
+          s_('CiStatusText|Skipped')
         end
 
         def label
diff --git a/lib/gitlab/ci/status/success.rb b/lib/gitlab/ci/status/success.rb
index 2a10e60414e..9389138e034 100644
--- a/lib/gitlab/ci/status/success.rb
+++ b/lib/gitlab/ci/status/success.rb
@@ -5,7 +5,7 @@ module Gitlab
     module Status
       class Success < Status::Core
         def text
-          s_('CiStatusText|passed')
+          s_('CiStatusText|Passed')
         end
 
         def label
diff --git a/lib/gitlab/ci/status/success_warning.rb b/lib/gitlab/ci/status/success_warning.rb
index 84a0e52f518..91f0ba1a58f 100644
--- a/lib/gitlab/ci/status/success_warning.rb
+++ b/lib/gitlab/ci/status/success_warning.rb
@@ -9,7 +9,7 @@ module Gitlab
       #
       class SuccessWarning < Status::Extended
         def text
-          s_('CiStatusText|warning')
+          s_('CiStatusText|Warning')
         end
 
         def label
@@ -20,6 +20,10 @@ module Gitlab
           'status_warning'
         end
 
+        def name
+          'SUCCESS_WITH_WARNINGS'
+        end
+
         def group
           'success-with-warnings'
         end
diff --git a/lib/gitlab/ci/status/waiting_for_resource.rb b/lib/gitlab/ci/status/waiting_for_resource.rb
index 9ced0aadb88..5714a68cac8 100644
--- a/lib/gitlab/ci/status/waiting_for_resource.rb
+++ b/lib/gitlab/ci/status/waiting_for_resource.rb
@@ -5,7 +5,7 @@ module Gitlab
     module Status
       class WaitingForResource < Status::Core
         def text
-          s_('CiStatusText|waiting')
+          s_('CiStatusText|Waiting')
         end
 
         def label
@@ -20,6 +20,10 @@ module Gitlab
           'favicon_status_pending'
         end
 
+        def name
+          'WAITING_FOR_RESOURCE'
+        end
+
         def group
           'waiting-for-resource'
         end