diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-23 12:07:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-23 12:07:30 +0300 |
| commit | 52192e0f19ca790dc9f44bc45730434100f83d90 (patch) | |
| tree | 5ff86f87ba3adb239c3d42ebc9ec94e2b85d90b5 /app/assets/javascripts/pages | |
| parent | 35b0f1fe13bf40c9f27797d0a0ad26851ad8dacd (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pages')
| -rw-r--r-- | app/assets/javascripts/pages/import/bulk_imports/history/components/bulk_imports_history_app.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/pages/import/history/components/import_error_details.vue | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/pages/import/bulk_imports/history/components/bulk_imports_history_app.vue b/app/assets/javascripts/pages/import/bulk_imports/history/components/bulk_imports_history_app.vue index 0ec382983a5..70fad2a62fc 100644 --- a/app/assets/javascripts/pages/import/bulk_imports/history/components/bulk_imports_history_app.vue +++ b/app/assets/javascripts/pages/import/bulk_imports/history/components/bulk_imports_history_app.vue @@ -161,7 +161,7 @@ export default { > </template> <template #row-details="{ item }"> - <pre>{{ item.failures }}</pre> + <pre><code>{{ item.failures }}</code></pre> </template> </gl-table> <pagination-bar diff --git a/app/assets/javascripts/pages/import/history/components/import_error_details.vue b/app/assets/javascripts/pages/import/history/components/import_error_details.vue index 837b0c0cabb..33ba73317f8 100644 --- a/app/assets/javascripts/pages/import/history/components/import_error_details.vue +++ b/app/assets/javascripts/pages/import/history/components/import_error_details.vue @@ -37,5 +37,7 @@ export default { </script> <template> <gl-loading-icon v-if="loading" size="md" /> - <pre v-else>{{ error || s__('BulkImport|No additional information provided.') }}</pre> + <pre + v-else + ><code>{{ error || s__('BulkImport|No additional information provided.') }}</code></pre> </template> |