diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
| commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
| tree | fb69158581673816a8cd895f9d352dcb3c678b1e /spec/frontend/vue_mr_widget/components/states/mr_widget_pipeline_blocked_spec.js | |
| parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) | |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'spec/frontend/vue_mr_widget/components/states/mr_widget_pipeline_blocked_spec.js')
| -rw-r--r-- | spec/frontend/vue_mr_widget/components/states/mr_widget_pipeline_blocked_spec.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_pipeline_blocked_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_pipeline_blocked_spec.js index bd77a1d657e..9b10b078e89 100644 --- a/spec/frontend/vue_mr_widget/components/states/mr_widget_pipeline_blocked_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_pipeline_blocked_spec.js @@ -22,7 +22,7 @@ describe('MRWidgetPipelineBlocked', () => { createWrapper(); expect(wrapper.text()).toBe( - 'Pipeline blocked. The pipeline for this merge request requires a manual action to proceed', + "Merge blocked: pipeline must succeed. It's waiting for a manual action to continue.", ); }); }); |