summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget/components
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-21 15:08:26 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-21 15:08:26 +0000
commitc859c3bfd242288065fe5e2d887f7204f09e2335 (patch)
tree10febaf8774a3ea6ab3773c0dd97658d673fb280 /app/assets/javascripts/vue_merge_request_widget/components
parent28ce39a3e0e7b47e53939a15fb823af9c433327a (diff)
downloadgitlab-ce-c859c3bfd242288065fe5e2d887f7204f09e2335.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components')
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue
index cf26003d038..a5e3115397a 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue
@@ -12,7 +12,7 @@ export default {
<div class="mr-widget-body media">
<status-icon :show-disabled-button="true" status="loading" />
<div class="media-body space-children">
- <span class="bold"> {{ s__('mrWidget|Checking ability to merge automatically') }} </span>
+ <span class="bold"> {{ s__('mrWidget|Checking ability to merge automatically…') }} </span>
</div>
</div>
</template>