diff options
Diffstat (limited to 'app/assets/javascripts/jobs/components/job_app.vue')
-rw-r--r-- | app/assets/javascripts/jobs/components/job_app.vue | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/app/assets/javascripts/jobs/components/job_app.vue b/app/assets/javascripts/jobs/components/job_app.vue index e760706c97e..00ff3fb939d 100644 --- a/app/assets/javascripts/jobs/components/job_app.vue +++ b/app/assets/javascripts/jobs/components/job_app.vue @@ -1,13 +1,13 @@ <script> +/* eslint-disable vue/no-v-html */ import { throttle, isEmpty } from 'lodash'; import { mapGetters, mapState, mapActions } from 'vuex'; -import { GlLoadingIcon } from '@gitlab/ui'; +import { GlLoadingIcon, GlIcon } from '@gitlab/ui'; import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils'; import { isScrolledToBottom } from '~/lib/utils/scroll_utils'; import { polyfillSticky } from '~/lib/utils/sticky'; import CiHeader from '~/vue_shared/components/header_ci_component.vue'; import Callout from '~/vue_shared/components/callout.vue'; -import Icon from '~/vue_shared/components/icon.vue'; import EmptyState from './empty_state.vue'; import EnvironmentsBlock from './environments_block.vue'; import ErasedBlock from './erased_block.vue'; @@ -27,7 +27,7 @@ export default { EmptyState, EnvironmentsBlock, ErasedBlock, - Icon, + GlIcon, Log, LogTopBar, StuckBlock, @@ -38,6 +38,11 @@ export default { }, mixins: [delayedJobMixin], props: { + artifactHelpUrl: { + type: String, + required: false, + default: '', + }, runnerSettingsUrl: { type: String, required: false, @@ -266,7 +271,7 @@ export default { :class="{ 'sticky-top border-bottom-0': hasTrace }" data-testid="archived-job" > - <icon name="lock" class="align-text-bottom" /> + <gl-icon name="lock" class="align-text-bottom" /> {{ __('This job is archived. Only the complete pipeline can be retried.') }} </div> <!-- job log --> @@ -319,6 +324,7 @@ export default { 'right-sidebar-expanded': isSidebarOpen, 'right-sidebar-collapsed': !isSidebarOpen, }" + :artifact-help-url="artifactHelpUrl" :runner-help-url="runnerHelpUrl" data-testid="job-sidebar" /> |