diff options
| author | Phil Hughes <me@iamphill.com> | 2018-11-21 11:49:31 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-11-21 11:49:31 +0000 |
| commit | 685e14f8887ef8f26fd15e935d377b2c806b6c38 (patch) | |
| tree | faff43575153743bdd42cbc3683384f30c2743fa /app | |
| parent | b8dd1425841521bffbe0f937565b9d60e9182be0 (diff) | |
| parent | febc473f541b2c82ec811b1540b2a7ceec8131ca (diff) | |
| download | gitlab-ce-685e14f8887ef8f26fd15e935d377b2c806b6c38.tar.gz | |
Merge branch '53578-fe-deployment-status' into 'master'
Adds missing status in deployment widget
See merge request gitlab-org/gitlab-ce!23239
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/deployment.vue | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue index 1c5b5d02e20..c0cf1b2f656 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue @@ -42,6 +42,8 @@ export default { running: __('Deploying to'), success: __('Deployed to'), failed: __('Failed to deploy to'), + created: __('Will deploy to'), + canceled: __('Failed to deploy to'), }, data() { return { |