diff --git a/ee/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js b/ee/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js index 3f8d6799870b16a37b9bbf2b984a474f828e259f..1665601d3268269676a4b841f0ed478c1541b78c 100644 --- a/ee/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js +++ b/ee/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js @@ -16,7 +16,7 @@ export const PIPELINE_MUST_SUCCEED_CONFLICT_TEXT = __( 'A CI/CD pipeline must run and be successful before merge.', ); export const MERGE_DISABLED_DEPENDENCIES_TEXT = __( - 'Merge blocked: all merge request dependencies must be merged.', + 'Merge blocked: Merge all open dependent merge requests, and remove all closed dependencies.', ); const MERGE_WHEN_PIPELINE_SUCCEEDS_HELP = helpPagePath( diff --git a/locale/gitlab.pot b/locale/gitlab.pot index c411ec34299f760bcc9a8f2ccce618f4aeadb0b3..b885b883d811d020d1b82e775362b7008d3528f5 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -29684,7 +29684,7 @@ msgstr "" msgid "Merge automatically (%{strategy})" msgstr "" -msgid "Merge blocked: all merge request dependencies must be merged." +msgid "Merge blocked: Merge all open dependent merge requests, and remove all closed dependencies." msgstr "" msgid "Merge blocked: pipeline must succeed. It's waiting for a manual job to continue."