Add latest changes from gitlab-org/gitlab@master

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>