summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-01-26 10:30:10 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-01-26 10:30:10 +0000
commit1e897804a32990a73237ed877cd64ae287dab132 (patch)
tree16909d76bba4f09485cfcad9a727f5afe4b1cc35
parent1f10fa8cee8ffb5587ad037d8d8d7c5371264cf4 (diff)
downloadgitlab-ce-1e897804a32990a73237ed877cd64ae287dab132.tar.gz
Adds missing i18n
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue
index d00808088bd..72887528bd8 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue
@@ -84,9 +84,9 @@
<div class="media-body">
<h4 class="flex-container-block">
<span class="append-right-10">
- Set by
+ {{ s__("mrWidget|Set by") }}
<mr-widget-author :author="mr.setToMWPSBy" />
- to be merged automatically when the pipeline succeeds
+ {{ s__("mrWidget|to be merged automatically when the pipeline succeeds") }}
</span>
<a
v-if="mr.canCancelAutomaticMerge"