Commit 23912a35 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'aqualls-ui-merge-dependencies' into 'master'

Revise UI text line about merge dependencies

See merge request gitlab-org/gitlab!74940
parents 3f26fab9 f9b788fa
import { __ } from '~/locale';
export const MERGE_DISABLED_TEXT = __('You can only merge once the items above are resolved.');
export const MERGE_DISABLED_TEXT = __(
'Merge blocked: all merge request dependencies must be merged or closed.',
);
export const MERGE_DISABLED_SKIPPED_PIPELINE_TEXT = __(
"Merge blocked: pipeline must succeed. It's waiting for a manual job to continue.",
);
......
......@@ -21737,6 +21737,9 @@ msgstr ""
msgid "Merge automatically (%{strategy})"
msgstr ""
msgid "Merge blocked: all merge request dependencies must be merged or closed."
msgstr ""
msgid "Merge blocked: new changes were just added."
msgstr ""
......@@ -39602,9 +39605,6 @@ msgstr ""
msgid "You can only edit files when you are on a branch"
msgstr ""
msgid "You can only merge once the items above are resolved."
msgstr ""
msgid "You can only merge once this merge request is approved."
msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment