diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-14 06:11:17 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-14 06:11:17 +0300 |
commit | 23980cf6907b64d336bc09c127bfaa0c9a2b7f18 (patch) | |
tree | 97861c3d9e6eb8c628cd4f20cfa1907d28bf9013 /app/assets/javascripts/jobs | |
parent | c7e53e67898682ac7ccb61525f66980989ddb75e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/jobs')
-rw-r--r-- | app/assets/javascripts/jobs/components/table/cells/actions_cell.vue | 18 | ||||
-rw-r--r-- | app/assets/javascripts/jobs/components/table/jobs_table.vue | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/app/assets/javascripts/jobs/components/table/cells/actions_cell.vue b/app/assets/javascripts/jobs/components/table/cells/actions_cell.vue index cfbd92c0fc0..6b3a4424a5b 100644 --- a/app/assets/javascripts/jobs/components/table/cells/actions_cell.vue +++ b/app/assets/javascripts/jobs/components/table/cells/actions_cell.vue @@ -135,15 +135,6 @@ export default { <template> <gl-button-group> - <gl-button - v-if="shouldDisplayArtifacts" - icon="download" - :title="$options.ACTIONS_DOWNLOAD_ARTIFACTS" - :href="artifactDownloadPath" - rel="nofollow" - download - data-testid="download-artifacts" - /> <template v-if="canReadJob"> <gl-button v-if="isActive" icon="cancel" :title="$options.CANCEL" @click="cancelJob()" /> <template v-else-if="isScheduled"> @@ -191,5 +182,14 @@ export default { /> </template> </template> + <gl-button + v-if="shouldDisplayArtifacts" + icon="download" + :title="$options.ACTIONS_DOWNLOAD_ARTIFACTS" + :href="artifactDownloadPath" + rel="nofollow" + download + data-testid="download-artifacts" + /> </gl-button-group> </template> diff --git a/app/assets/javascripts/jobs/components/table/jobs_table.vue b/app/assets/javascripts/jobs/components/table/jobs_table.vue index 076c0e78b11..298c99c4162 100644 --- a/app/assets/javascripts/jobs/components/table/jobs_table.vue +++ b/app/assets/javascripts/jobs/components/table/jobs_table.vue @@ -141,7 +141,7 @@ export default { </template> <template #cell(actions)="{ item }"> - <actions-cell :job="item" /> + <actions-cell class="gl-float-right" :job="item" /> </template> </gl-table> </template> |