diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-01 18:11:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-01 18:11:22 +0300 |
commit | eac94e5cd6a59aad41ff1f86ed7cc892898d8516 (patch) | |
tree | 0fb81af921599437d44d6ad9b776892b74ae74c1 /app/assets/javascripts/jobs | |
parent | 3a5bee787984a139396c64372b6e14c4cb26efc1 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/jobs')
-rw-r--r-- | app/assets/javascripts/jobs/components/job/sidebar/legacy_sidebar_header.vue | 9 | ||||
-rw-r--r-- | app/assets/javascripts/jobs/constants.js | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/javascripts/jobs/components/job/sidebar/legacy_sidebar_header.vue b/app/assets/javascripts/jobs/components/job/sidebar/legacy_sidebar_header.vue index 263b2d141c9..64b497c3550 100644 --- a/app/assets/javascripts/jobs/components/job/sidebar/legacy_sidebar_header.vue +++ b/app/assets/javascripts/jobs/components/job/sidebar/legacy_sidebar_header.vue @@ -35,6 +35,11 @@ export default { retryButtonCategory() { return this.job.status && this.job.recoverable ? 'primary' : 'secondary'; }, + buttonTitle() { + return this.job.status && this.job.status.text === 'passed' + ? this.$options.i18n.runAgainJobButtonLabel + : this.$options.i18n.retryJobButtonLabel; + }, }, methods: { ...mapActions(['toggleSidebar']), @@ -66,8 +71,8 @@ export default { <job-sidebar-retry-button v-if="job.retry_path" v-gl-tooltip.left - :title="$options.i18n.retryJobButtonLabel" - :aria-label="$options.i18n.retryJobButtonLabel" + :title="buttonTitle" + :aria-label="buttonTitle" :category="retryButtonCategory" :href="job.retry_path" :modal-id="$options.forwardDeploymentFailureModalId" diff --git a/app/assets/javascripts/jobs/constants.js b/app/assets/javascripts/jobs/constants.js index 50ee7bd20dd..e9475994e8b 100644 --- a/app/assets/javascripts/jobs/constants.js +++ b/app/assets/javascripts/jobs/constants.js @@ -15,6 +15,7 @@ export const JOB_SIDEBAR_COPY = { retry: __('Retry'), retryJobButtonLabel: s__('Job|Retry'), toggleSidebar: __('Toggle Sidebar'), + runAgainJobButtonLabel: s__('Job|Run again'), }; export const JOB_RETRY_FORWARD_DEPLOYMENT_MODAL = { |