Merge branch 'calebw-update-stuck-runner-message' into 'master'

Clarify verbiage for stuck jobs message

Closes #29994

See merge request gitlab-org/gitlab!32250

app/assets/javascripts/jobs/components/stuck_block.vue

@@ -29,7 +29,7 @@ export default {
     <p v-if="tags.length" class="js-stuck-with-tags gl-mb-0">
       {{
         s__(`This job is stuck because you don't have
-  any active runners online with any of these tags assigned to them:`)
+  any active runners online or available with any of these tags assigned to them:`)
       }}
       <span v-for="(tag, index) in tags" :key="index" class="badge badge-primary append-right-4">
         {{ tag }}
@@ -48,9 +48,9 @@ export default {
       }}
     </p>
 
-    {{ __('Go to') }}
+    {{ __('Go to project') }}
     <gl-link v-if="runnersPath" :href="runnersPath" class="js-runners-path">
-      {{ __('Runners page') }}
+      {{ __('CI settings') }}
     </gl-link>
   </div>
 </template>

changelogs/unreleased/calebw-update-stuck-runner-message.yml

+---
+title: Clarify verbiage for stuck job messages.
+merge_request: 32250
+author:
+type: other

locale/gitlab.pot

@@ -3642,6 +3642,9 @@ msgstr ""
 msgid "CI Lint"
 msgstr ""
 
+msgid "CI settings"
+msgstr ""
+
 msgid "CI variables"
 msgstr ""
 
@@ -10609,9 +10612,6 @@ msgstr ""
 msgid "Go full screen"
 msgstr ""
 
-msgid "Go to"
-msgstr ""
-
 msgid "Go to %{link_to_google_takeout}."
 msgstr ""
 
@@ -18807,9 +18807,6 @@ msgstr ""
 msgid "Runners currently online: %{active_runners_count}"
 msgstr ""
 
-msgid "Runners page"
-msgstr ""
-
 msgid "Runners page."
 msgstr ""
 
@@ -22483,7 +22480,7 @@ msgstr ""
 msgid "This job is preparing to start"
 msgstr ""
 
-msgid "This job is stuck because you don't have any active runners online with any of these tags assigned to them:"
+msgid "This job is stuck because you don't have any active runners online or available with any of these tags assigned to them:"
 msgstr ""
 
 msgid "This job is stuck because you don't have any active runners that can run this job."

spec/features/projects/jobs_spec.rb

@@ -940,7 +940,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
 
         it 'renders message about job being stuck because of no runners with the specified tags' do
           expect(page).to have_css('.js-stuck-with-tags')
-          expect(page).to have_content("This job is stuck because you don't have any active runners online with any of these tags assigned to them:")
+          expect(page).to have_content("This job is stuck because you don't have any active runners online or available with any of these tags assigned to them:")
         end
       end
 
@@ -950,7 +950,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
 
         it 'renders message about job being stuck because of no runners with the specified tags' do
           expect(page).to have_css('.js-stuck-with-tags')
-          expect(page).to have_content("This job is stuck because you don't have any active runners online with any of these tags assigned to them:")
+          expect(page).to have_content("This job is stuck because you don't have any active runners online or available with any of these tags assigned to them:")
         end
       end