summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-20 12:09:02 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-20 12:09:02 +0000
commit98252e0dd60cbcb316231085e206d9872f243b8a (patch)
tree304021f4190aabcc74f1359866c0efff84995729 /app/assets/javascripts/vue_merge_request_widget
parent2ee5991b42717969af93cb30d863aafab04dff8a (diff)
downloadgitlab-ce-98252e0dd60cbcb316231085e206d9872f243b8a.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget')
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_info.vue4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_info.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_info.vue
index db4a4ece002..33db9b87b17 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_info.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_info.vue
@@ -32,12 +32,12 @@ export default {
},
},
deployedTextMap: {
- [MANUAL_DEPLOY]: __('Can deploy manually to'),
+ [MANUAL_DEPLOY]: __('Can be manually deployed to'),
[WILL_DEPLOY]: __('Will deploy to'),
[RUNNING]: __('Deploying to'),
[SUCCESS]: __('Deployed to'),
[FAILED]: __('Failed to deploy to'),
- [CANCELED]: __('Canceled deploy to'),
+ [CANCELED]: __('Canceled deployment to'),
},
computed: {
deployTimeago() {