Commit 789b8988 authored by Martin Wortschack's avatar Martin Wortschack

Merge branch 'fix-pipeline-tooltip' into 'master'

fix: change tooltip text for pipeline

See merge request gitlab-org/gitlab!26315
parents 9f8873df a1f610b0
...@@ -71,8 +71,8 @@ export default { ...@@ -71,8 +71,8 @@ export default {
}, },
computed: { computed: {
statusTitle() { statusTitle() {
return sprintf(s__('Commits|Commit: %{commitText}'), { return sprintf(s__('PipelineStatusTooltip|Pipeline: %{ciStatus}'), {
commitText: this.commit.pipeline.detailedStatus.text, ciStatus: this.commit.pipeline.detailedStatus.text,
}); });
}, },
isLoading() { isLoading() {
......
---
title: Change tooltip text for pipeline on last commit widget
merge_request: 26315
author:
type: other
...@@ -4993,9 +4993,6 @@ msgstr "" ...@@ -4993,9 +4993,6 @@ msgstr ""
msgid "Commits|An error occurred while fetching merge requests data." msgid "Commits|An error occurred while fetching merge requests data."
msgstr "" msgstr ""
msgid "Commits|Commit: %{commitText}"
msgstr ""
msgid "Commits|History" msgid "Commits|History"
msgstr "" msgstr ""
......
...@@ -14,7 +14,7 @@ describe 'Projects > Show > User sees last commit CI status' do ...@@ -14,7 +14,7 @@ describe 'Projects > Show > User sees last commit CI status' do
page.within '.commit-detail' do page.within '.commit-detail' do
expect(page).to have_content(project.commit.sha[0..6]) expect(page).to have_content(project.commit.sha[0..6])
expect(page).to have_selector('[aria-label="Commit: skipped"]') expect(page).to have_selector('[aria-label="Pipeline: skipped"]')
end end
end end
end end
...@@ -68,10 +68,10 @@ exports[`Repository last commit component renders commit widget 1`] = ` ...@@ -68,10 +68,10 @@ exports[`Repository last commit component renders commit widget 1`] = `
<gl-link-stub <gl-link-stub
class="js-commit-pipeline" class="js-commit-pipeline"
href="https://test.com/pipeline" href="https://test.com/pipeline"
title="Commit: failed" title="Pipeline: failed"
> >
<ci-icon-stub <ci-icon-stub
aria-label="Commit: failed" aria-label="Pipeline: failed"
cssclasses="" cssclasses=""
size="24" size="24"
status="[object Object]" status="[object Object]"
...@@ -174,10 +174,10 @@ exports[`Repository last commit component renders the signature HTML as returned ...@@ -174,10 +174,10 @@ exports[`Repository last commit component renders the signature HTML as returned
<gl-link-stub <gl-link-stub
class="js-commit-pipeline" class="js-commit-pipeline"
href="https://test.com/pipeline" href="https://test.com/pipeline"
title="Commit: failed" title="Pipeline: failed"
> >
<ci-icon-stub <ci-icon-stub
aria-label="Commit: failed" aria-label="Pipeline: failed"
cssclasses="" cssclasses=""
size="24" size="24"
status="[object Object]" status="[object Object]"
......
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