Commit f87cff66 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch 'pb-new-pipelines-table-fixes' into 'master'

Fixes for new_pipelines_table refactor

See merge request gitlab-org/gitlab!55860
parents 8ecda454 bad3d5d8
......@@ -70,7 +70,6 @@ export default {
},
{
key: 'actions',
label: '',
thClass: DEFAULT_TH_CLASSES,
tdClass: DEFAULT_TD_CLASS,
columnClass: 'gl-w-20p',
......@@ -190,6 +189,7 @@ export default {
fixed
>
<template #head(actions)>
<span class="gl-display-block gl-lg-display-none!">{{ s__('Pipeline|Actions') }}</span>
<slot name="table-header-actions"></slot>
</template>
......@@ -202,11 +202,7 @@ export default {
</template>
<template #cell(pipeline)="{ item }">
<pipeline-url
class="gl-text-truncate"
:pipeline="item"
:pipeline-schedule-url="pipelineScheduleUrl"
/>
<pipeline-url :pipeline="item" :pipeline-schedule-url="pipelineScheduleUrl" />
</template>
<template #cell(triggerer)="{ item }">
......
......@@ -22283,6 +22283,9 @@ msgstr ""
msgid "Pipelines|parent"
msgstr ""
msgid "Pipeline|Actions"
msgstr ""
msgid "Pipeline|Branch name"
msgstr ""
......
......@@ -117,9 +117,7 @@ describe('Pipelines Table', () => {
expect(findCommitTh().text()).toBe('Commit');
expect(findStagesTh().text()).toBe('Stages');
expect(findTimeAgoTh().text()).toBe('Duration');
// last column should have no text in th
expect(findActionsTh().text()).toBe('');
expect(findActionsTh().text()).toBe('Actions');
});
it('should display a table row', () => {
......
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