diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-15 00:12:27 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-15 00:12:27 +0300 |
| commit | e916a9880b4ea8c7cd4d521b4260c4732e8e2978 (patch) | |
| tree | dcc8f147c8152b25b738a7fbbfac79040ea6ae8d /app/assets/javascripts/vue_merge_request_widget/components | |
| parent | 4db74ea1477fe70d132bf75f1bf3f1a728fc72e4 (diff) | |
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/pipeline_failed.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/pipeline_failed.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/pipeline_failed.vue index d88dad2e086..d204befef58 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/pipeline_failed.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/pipeline_failed.vue @@ -20,7 +20,7 @@ export default { }, i18n: { failedMessage: s__( - `mrWidget|The pipeline for this merge request did not complete. Push a new commit to fix the failure, or check the %{linkStart}troubleshooting documentation%{linkEnd} to see other possible actions.`, + `mrWidget|Merge blocked: pipeline must succeed. Push a commit that fixes the failure, or %{linkStart}learn about other solutions.%{linkEnd}`, ), }, }; |