Merge branch '216048-misleading-message-displays-when-mr-request-is-first-submitted' into 'master'

Resolve "Misleading message displays when MR request is first submitted" See merge request !34958

Merge branch '216048-misleading-message-displays-when-mr-request-is-first-submitted' into 'master'
f4264d70 · Andrew Fontaine · a31e72db · e6dd38f3 · f4264d70 · f4264d70
Commit f4264d70 authored 4 years ago by Andrew Fontaine
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
@@ -355,16 +355,19 @@ export default {
            </template>
            <template v-else>
              <div class="bold js-resolve-mr-widget-items-message">
-                <gl-sprintf
+                <div
                  v-if="hasPipelineMustSucceedConflict"
-                  :message="pipelineMustSucceedConflictText"
+                  class="gl-display-flex gl-align-items-center"
                >
-                  <template #link="{ content }">
-                    <gl-link :href="mr.pipelineMustSucceedDocsPath" target="_blank">
-                      {{ content }}
-                    </gl-link>
-                  </template>
-                </gl-sprintf>
+                  <gl-sprintf :message="pipelineMustSucceedConflictText" />
+                  <gl-link
+                    :href="mr.pipelineMustSucceedDocsPath"
+                    target="_blank"
+                    class="gl-display-flex gl-ml-2"
+                  >
+                    <gl-icon name="question" />
+                  </gl-link>
+                </div>
                <gl-sprintf v-else :message="mergeDisabledText" />
              </div>
            </template>

--- a/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js
+++ b/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js
@@ -2,7 +2,7 @@ import { __ } from '~/locale';

 export const MERGE_DISABLED_TEXT = __('You can only merge once the items above are resolved.');
 export const PIPELINE_MUST_SUCCEED_CONFLICT_TEXT = __(
-  'Pipelines must succeed for merge requests to be eligible to merge. Please enable pipelines for this project to continue. For more information, see the %{linkStart}documentation.%{linkEnd}',
+  'A CI/CD pipeline must run and be successful before merge.',
 );

 export default {

--- a/changelogs/unreleased/216048-misleading-message-displays-when-mr-request-is-first-submitted.yml
+++ b/changelogs/unreleased/216048-misleading-message-displays-when-mr-request-is-first-submitted.yml
+---
+title: Resolve Misleading message displays when MR request is first submitted
+merge_request: 34958
+author:
+type: fixed
--- 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
@@ -6,7 +6,7 @@ export const MERGE_DISABLED_TEXT_UNAPPROVED = __(
  'You can only merge once this merge request is approved.',
 );
 export const PIPELINE_MUST_SUCCEED_CONFLICT_TEXT = __(
-  'Pipelines must succeed for merge requests to be eligible to merge. Please enable pipelines for this project to continue. For more information, see the %{linkStart}documentation.%{linkEnd}',
+  'A CI/CD pipeline must run and be successful before merge.',
 );

 export default {

--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1008,6 +1008,9 @@ msgstr ""
 msgid "A .NET Core console application template, customizable for any .NET Core project"
 msgstr ""
  
+msgid "A CI/CD pipeline must run and be successful before merge."
+msgstr ""
+
 msgid "A GitBook site that uses Netlify for CI/CD instead of GitLab, but still with all the other great GitLab features."
 msgstr ""
  
@@ -16627,9 +16630,6 @@ msgstr ""
 msgid "Pipelines for merge requests are configured. A detached pipeline runs in the context of the merge request, and not against the merged result. Learn more in the documentation for Pipelines for Merged Results."
 msgstr ""
  
-msgid "Pipelines must succeed for merge requests to be eligible to merge. Please enable pipelines for this project to continue. For more information, see the %{linkStart}documentation.%{linkEnd}"
-msgstr ""
-
 msgid "Pipelines settings for '%{project_name}' were successfully updated."
 msgstr ""