diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-05 15:09:04 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-05 15:09:04 +0000 |
| commit | 74dd67ddea70f70830f3fe1ca65b06b604ec229f (patch) | |
| tree | 7347826741dfed35d59e53890907e9e17a7afa4f /app/assets/javascripts/vue_merge_request_widget | |
| parent | a662b146aca7227bc800eed4878000d2b7c9d757 (diff) | |
| download | gitlab-ce-74dd67ddea70f70830f3fe1ca65b06b604ec229f.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/states/work_in_progress.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue index eba3d50fdc9..e12682b0a49 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue @@ -143,7 +143,7 @@ export default { <div class="media-body"> <div class="gl-ml-3 float-left"> <span class="gl-font-weight-bold"> - {{ __('This merge request is still a work in progress.') }} + {{ __('This merge request is still a draft.') }} </span> <span class="gl-display-block text-muted">{{ __("Draft merge requests can't be merged.") |