From 6c3545f3d104c3d4e7b02ff87fb8ea690ca0ec79 Mon Sep 17 00:00:00 2001
From: Kai Armstrong <karmstrong@gitlab.com>
Date: Fri, 23 Feb 2024 11:59:18 +0000
Subject: [PATCH] Change mr widget dependency text
This updates the merge widget dependency text to
better align with other strings.
---
.../vue_merge_request_widget/components/checks/constants.js | 2 +-
app/graphql/types/merge_requests/detailed_merge_status_enum.rb | 2 +-
doc/api/graphql/reference/index.md | 2 +-
.../merge_request/merge_request_widget_blocking_mrs_spec.rb | 2 +-
locale/gitlab.pot | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/checks/constants.js b/app/assets/javascripts/vue_merge_request_widget/components/checks/constants.js
index 28ca8ba9d8a4a..7f8f75e1dcbec 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/checks/constants.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/checks/constants.js
@@ -19,7 +19,7 @@ export const FAILURE_REASONS = {
need_rebase: __('Merge request must be rebased, because a fast-forward merge is not possible.'),
not_approved: __('All required approvals must be given.'),
policies_denied: __('Denied licenses must be removed or approved.'),
- merge_request_blocked: __('Merge request dependencies have been merged.'),
+ merge_request_blocked: __('Merge request dependencies must be merged.'),
status_checks_must_pass: __('Status checks must pass.'),
jira_association_missing: __('Either the title or description must reference a Jira issue.'),
};
diff --git a/app/graphql/types/merge_requests/detailed_merge_status_enum.rb b/app/graphql/types/merge_requests/detailed_merge_status_enum.rb
index 2d32bbe9148e5..ee64760c086bb 100644
--- a/app/graphql/types/merge_requests/detailed_merge_status_enum.rb
+++ b/app/graphql/types/merge_requests/detailed_merge_status_enum.rb
@@ -41,7 +41,7 @@ class DetailedMergeStatusEnum < BaseEnum
description: 'Merge request must be approved before merging.'
value 'BLOCKED_STATUS',
value: :merge_request_blocked,
- description: 'Merge request dependencies have been merged.'
+ description: 'Merge request dependencies must be merged.'
value 'POLICIES_DENIED',
value: :policies_denied,
description: 'There are denied policies for the merge request.'
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 7cba4f4c5b84e..8334c18c56108 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -31279,7 +31279,7 @@ Detailed representation of whether a GitLab merge request can be merged.
| Value | Description |
| ----- | ----------- |
-| <a id="detailedmergestatusblocked_status"></a>`BLOCKED_STATUS` | Merge request dependencies have been merged. |
+| <a id="detailedmergestatusblocked_status"></a>`BLOCKED_STATUS` | Merge request dependencies must be merged. |
| <a id="detailedmergestatusbroken_status"></a>`BROKEN_STATUS` | Can not merge the source into the target branch, potential conflict. |
| <a id="detailedmergestatuschecking"></a>`CHECKING` | Currently checking for mergeability. |
| <a id="detailedmergestatusci_must_pass"></a>`CI_MUST_PASS` | Pipeline must succeed before merging. |
diff --git a/ee/spec/features/merge_request/merge_request_widget_blocking_mrs_spec.rb b/ee/spec/features/merge_request/merge_request_widget_blocking_mrs_spec.rb
index 631de04bbaa73..8c7230a04e604 100644
--- a/ee/spec/features/merge_request/merge_request_widget_blocking_mrs_spec.rb
+++ b/ee/spec/features/merge_request/merge_request_widget_blocking_mrs_spec.rb
@@ -22,7 +22,7 @@
it 'disables merge button when blocking merge request is open' do
click_button 'Expand merge checks'
- expect(page).to have_content('Merge request dependencies have been merged.')
+ expect(page).to have_content('Merge request dependencies must be merged.')
end
context 'merged blocking merge request' do
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index ba50eaa0e2d97..9b4d7d7109dce 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -30787,7 +30787,7 @@ msgstr ""
msgid "Merge request dependencies"
msgstr ""
-msgid "Merge request dependencies have been merged."
+msgid "Merge request dependencies must be merged."
msgstr ""
msgid "Merge request events"
--
GitLab