Commit 7951782c authored by Caleb Williamson's avatar Caleb Williamson Committed by Tim Zallmann

Clarify verbiage for stuck jobs message

parent e4996d77
...@@ -29,7 +29,7 @@ export default { ...@@ -29,7 +29,7 @@ export default {
<p v-if="tags.length" class="js-stuck-with-tags gl-mb-0"> <p v-if="tags.length" class="js-stuck-with-tags gl-mb-0">
{{ {{
s__(`This job is stuck because you don't have 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"> <span v-for="(tag, index) in tags" :key="index" class="badge badge-primary append-right-4">
{{ tag }} {{ tag }}
...@@ -48,9 +48,9 @@ export default { ...@@ -48,9 +48,9 @@ export default {
}} }}
</p> </p>
{{ __('Go to') }} {{ __('Go to project') }}
<gl-link v-if="runnersPath" :href="runnersPath" class="js-runners-path"> <gl-link v-if="runnersPath" :href="runnersPath" class="js-runners-path">
{{ __('Runners page') }} {{ __('CI settings') }}
</gl-link> </gl-link>
</div> </div>
</template> </template>
---
title: Clarify verbiage for stuck job messages.
merge_request: 32250
author:
type: other
...@@ -3648,6 +3648,9 @@ msgstr "" ...@@ -3648,6 +3648,9 @@ msgstr ""
msgid "CI Lint" msgid "CI Lint"
msgstr "" msgstr ""
msgid "CI settings"
msgstr ""
msgid "CI variables" msgid "CI variables"
msgstr "" msgstr ""
...@@ -10609,9 +10612,6 @@ msgstr "" ...@@ -10609,9 +10612,6 @@ msgstr ""
msgid "Go full screen" msgid "Go full screen"
msgstr "" msgstr ""
msgid "Go to"
msgstr ""
msgid "Go to %{link_to_google_takeout}." msgid "Go to %{link_to_google_takeout}."
msgstr "" msgstr ""
...@@ -18801,9 +18801,6 @@ msgstr "" ...@@ -18801,9 +18801,6 @@ msgstr ""
msgid "Runners currently online: %{active_runners_count}" msgid "Runners currently online: %{active_runners_count}"
msgstr "" msgstr ""
msgid "Runners page"
msgstr ""
msgid "Runners page." msgid "Runners page."
msgstr "" msgstr ""
...@@ -22483,7 +22480,7 @@ msgstr "" ...@@ -22483,7 +22480,7 @@ msgstr ""
msgid "This job is preparing to start" msgid "This job is preparing to start"
msgstr "" 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 "" msgstr ""
msgid "This job is stuck because you don't have any active runners that can run this job." msgid "This job is stuck because you don't have any active runners that can run this job."
......
...@@ -940,7 +940,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do ...@@ -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 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_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
end end
...@@ -950,7 +950,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do ...@@ -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 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_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
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment