Commit e0ea28da authored by Amy Qualls's avatar Amy Qualls Committed by Phil Hughes

UI text: the MR must be approved first

parent 58e868b1
...@@ -9,7 +9,7 @@ export default { ...@@ -9,7 +9,7 @@ export default {
pipelineFailed: s__( pipelineFailed: s__(
'mrWidget|The pipeline for this merge request did not complete. Push a new commit to fix the failure.', 'mrWidget|The pipeline for this merge request did not complete. Push a new commit to fix the failure.',
), ),
approvalNeeded: s__('mrWidget|You can only merge once this merge request is approved.'), approvalNeeded: s__('mrWidget|Merge blocked: this merge request must be approved.'),
unresolvedDiscussions: s__('mrWidget|Merge blocked: all threads must be resolved.'), unresolvedDiscussions: s__('mrWidget|Merge blocked: all threads must be resolved.'),
}, },
components: { components: {
......
import { isNumber, isString } from 'lodash'; import { isNumber, isString } from 'lodash';
import { getIdFromGraphQLId } from '~/graphql_shared/utils'; import { getIdFromGraphQLId } from '~/graphql_shared/utils';
import { __ } from '~/locale'; import { __, s__ } from '~/locale';
import { import {
MTWPS_MERGE_STRATEGY, MTWPS_MERGE_STRATEGY,
MT_MERGE_STRATEGY, MT_MERGE_STRATEGY,
...@@ -8,8 +8,8 @@ import { ...@@ -8,8 +8,8 @@ import {
} from '~/vue_merge_request_widget/constants'; } from '~/vue_merge_request_widget/constants';
import base from '~/vue_merge_request_widget/mixins/ready_to_merge'; import base from '~/vue_merge_request_widget/mixins/ready_to_merge';
export const MERGE_DISABLED_TEXT_UNAPPROVED = __( export const MERGE_DISABLED_TEXT_UNAPPROVED = s__(
'You can only merge once this merge request is approved.', 'mrWidget|Merge blocked: this merge request must be approved.',
); );
export const PIPELINE_MUST_SUCCEED_CONFLICT_TEXT = __( export const PIPELINE_MUST_SUCCEED_CONFLICT_TEXT = __(
'A CI/CD pipeline must run and be successful before merge.', 'A CI/CD pipeline must run and be successful before merge.',
......
...@@ -39724,9 +39724,6 @@ msgstr "" ...@@ -39724,9 +39724,6 @@ msgstr ""
msgid "You can only edit files when you are on a branch" msgid "You can only edit files when you are on a branch"
msgstr "" msgstr ""
msgid "You can only merge once this merge request is approved."
msgstr ""
msgid "You can only transfer the project to namespaces you manage." msgid "You can only transfer the project to namespaces you manage."
msgstr "" msgstr ""
...@@ -41617,6 +41614,9 @@ msgstr "" ...@@ -41617,6 +41614,9 @@ msgstr ""
msgid "mrWidget|Merge blocked: pipeline must succeed. It's waiting for a manual action to continue." msgid "mrWidget|Merge blocked: pipeline must succeed. It's waiting for a manual action to continue."
msgstr "" msgstr ""
msgid "mrWidget|Merge blocked: this merge request must be approved."
msgstr ""
msgid "mrWidget|Merge failed." msgid "mrWidget|Merge failed."
msgstr "" msgstr ""
...@@ -41761,9 +41761,6 @@ msgstr "" ...@@ -41761,9 +41761,6 @@ msgstr ""
msgid "mrWidget|What is a merge train?" msgid "mrWidget|What is a merge train?"
msgstr "" msgstr ""
msgid "mrWidget|You can only merge once this merge request is approved."
msgstr ""
msgid "mrWidget|Your password" msgid "mrWidget|Your password"
msgstr "" 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