Commit a6701647 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'vue-i18n-js-pipelines-directory' into 'master'

Vue-i18n: autofix for app/assets/javascripts/pipelines directory

See merge request gitlab-org/gitlab-ce!30015
parents f88ab64f 763a9e83
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
import { GlLoadingIcon } from '@gitlab/ui'; import { GlLoadingIcon } from '@gitlab/ui';
import ciHeader from '../../vue_shared/components/header_ci_component.vue'; import ciHeader from '../../vue_shared/components/header_ci_component.vue';
import eventHub from '../event_hub'; import eventHub from '../event_hub';
import { __ } from '~/locale';
export default { export default {
name: 'PipelineHeaderSection', name: 'PipelineHeaderSection',
...@@ -54,7 +55,7 @@ export default { ...@@ -54,7 +55,7 @@ export default {
if (this.pipeline.retry_path) { if (this.pipeline.retry_path) {
actions.push({ actions.push({
label: 'Retry', label: __('Retry'),
path: this.pipeline.retry_path, path: this.pipeline.retry_path,
cssClass: 'js-retry-button btn btn-inverted-secondary', cssClass: 'js-retry-button btn btn-inverted-secondary',
type: 'button', type: 'button',
...@@ -64,7 +65,7 @@ export default { ...@@ -64,7 +65,7 @@ export default {
if (this.pipeline.cancel_path) { if (this.pipeline.cancel_path) {
actions.push({ actions.push({
label: 'Cancel running', label: __('Cancel running'),
path: this.pipeline.cancel_path, path: this.pipeline.cancel_path,
cssClass: 'js-btn-cancel-pipeline btn btn-danger', cssClass: 'js-btn-cancel-pipeline btn btn-danger',
type: 'button', type: 'button',
......
...@@ -94,9 +94,8 @@ export default { ...@@ -94,9 +94,8 @@ export default {
tabindex="0" tabindex="0"
class="js-pipeline-url-autodevops badge badge-info autodevops-badge" class="js-pipeline-url-autodevops badge badge-info autodevops-badge"
role="button" role="button"
>{{ __('Auto DevOps') }}</gl-link
> >
Auto DevOps
</gl-link>
<span v-if="pipeline.flags.stuck" class="js-pipeline-url-stuck badge badge-warning"> <span v-if="pipeline.flags.stuck" class="js-pipeline-url-stuck badge badge-warning">
{{ __('stuck') }} {{ __('stuck') }}
</span> </span>
......
...@@ -1873,6 +1873,9 @@ msgstr "" ...@@ -1873,6 +1873,9 @@ msgstr ""
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr ""
msgid "Cancel running"
msgstr ""
msgid "Cancel this job" msgid "Cancel this job"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment