Merge branch '352939-pipeline-label-renames' into 'master'

Update pipeline label text

See merge request gitlab-org/gitlab!81032

app/assets/javascripts/pipelines/components/pipelines_list/pipeline_url.vue

@@ -248,11 +248,15 @@ export default {
       <gl-badge
         v-if="pipeline.flags.merge_train_pipeline"
         v-gl-tooltip
-        :title="__('This is a merge train pipeline')"
+        :title="
+          s__(
+            'Pipeline|This pipeline ran on the contents of this merge request combined with the contents of all other merge requests queued for merging into the target branch.',
+          )
+        "
         variant="info"
         size="sm"
         data-testid="pipeline-url-train"
-        >{{ __('train') }}</gl-badge
+        >{{ s__('Pipeline|merge train') }}</gl-badge
       >
       <gl-badge
         v-if="pipeline.flags.yaml_errors"
@@ -320,14 +324,14 @@ export default {
         v-if="pipeline.flags.detached_merge_request_pipeline"
         v-gl-tooltip
         :title="
-          __(
-            'Merge request pipelines 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 merge request pipelines.',
+          s__(
+            `Pipeline|This pipeline ran on the contents of this merge request's source branch, not the target branch.`,
           )
         "
         variant="info"
         size="sm"
         data-testid="pipeline-url-detached"
-        >{{ __('detached') }}</gl-badge
+        >{{ s__('Pipeline|merge request') }}</gl-badge
       >
       <gl-badge
         v-if="isInFork"

app/views/projects/pipelines/_info.html.haml

@@ -27,7 +27,7 @@
       - if @pipeline.latest?
         = gl_badge_tag s_('Pipelines|latest'), { variant: :success, size: :sm }, { class: 'js-pipeline-url-latest has-tooltip', title: _("Latest pipeline for the most recent commit on this branch") }
       - if @pipeline.merge_train_pipeline?
-        = gl_badge_tag s_('Pipelines|train'), { variant: :info, size: :sm }, { class: 'js-pipeline-url-train has-tooltip', title: _("This is a merge train pipeline") }
+        = gl_badge_tag s_('Pipelines|merge train'), { variant: :info, size: :sm }, { class: 'js-pipeline-url-train has-tooltip', title: s_("Pipelines|This pipeline ran on the contents of this merge request combined with the contents of all other merge requests queued for merging into the target branch.") }
       - if @pipeline.has_yaml_errors?
         = gl_badge_tag s_('Pipelines|yaml invalid'), { variant: :danger, size: :sm }, { class: 'js-pipeline-url-yaml has-tooltip', title: @pipeline.yaml_errors }
       - if @pipeline.failure_reason?
@@ -38,7 +38,7 @@
         - popover_content_text = _('Learn more about Auto DevOps')
         = gl_badge_tag s_('Pipelines|Auto DevOps'), { variant: :info, size: :sm }, { class: 'js-pipeline-url-autodevops', href: "#", tabindex: "0", role: "button", data: { container: 'body', toggle: 'popover', placement: 'top', html: 'true', triggers: 'focus', title: "<div class='gl-font-weight-normal gl-line-height-normal'>#{popover_title_text}</div>", content: "<a href='#{popover_content_url}' target='_blank' rel='noopener noreferrer nofollow'>#{popover_content_text}</a>" } }
       - if @pipeline.detached_merge_request_pipeline?
-        = gl_badge_tag s_('Pipelines|detached'), { variant: :info, size: :sm }, { class: 'js-pipeline-url-mergerequest has-tooltip', title: _('Merge request pipelines 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 merge request pipelines.') }
+        = gl_badge_tag s_('Pipelines|merge request'), { variant: :info, size: :sm }, { class: 'js-pipeline-url-mergerequest has-tooltip', title: s_("Pipelines|This pipeline ran on the contents of this merge request's source branch, not the target branch.") }
       - if @pipeline.stuck?
         = gl_badge_tag s_('Pipelines|stuck'), { variant: :warning, size: :sm }, { class: 'js-pipeline-url-stuck has-tooltip' }
 

locale/gitlab.pot

@@ -22972,9 +22972,6 @@ msgstr ""
 msgid "Merge request not merged"
 msgstr ""
 
-msgid "Merge request pipelines 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 merge request pipelines."
-msgstr ""
-
 msgid "Merge request reports"
 msgstr ""
 
@@ -27017,6 +27014,12 @@ msgstr ""
 msgid "Pipelines|This is a child pipeline within the parent pipeline"
 msgstr ""
 
+msgid "Pipelines|This pipeline ran on the contents of this merge request combined with the contents of all other merge requests queued for merging into the target branch."
+msgstr ""
+
+msgid "Pipelines|This pipeline ran on the contents of this merge request's source branch, not the target branch."
+msgstr ""
+
 msgid "Pipelines|This pipeline will run code originating from a forked project merge request. This means that the code can potentially have security considerations like exposing CI variables."
 msgstr ""
 
@@ -27059,9 +27062,6 @@ msgstr ""
 msgid "Pipelines|Your changes have been successfully committed. Now redirecting to the new merge request page."
 msgstr ""
 
-msgid "Pipelines|detached"
-msgstr ""
-
 msgid "Pipelines|error"
 msgstr ""
 
@@ -27071,10 +27071,13 @@ msgstr ""
 msgid "Pipelines|latest"
 msgstr ""
 
-msgid "Pipelines|stuck"
+msgid "Pipelines|merge request"
+msgstr ""
+
+msgid "Pipelines|merge train"
 msgstr ""
 
-msgid "Pipelines|train"
+msgid "Pipelines|stuck"
 msgstr ""
 
 msgid "Pipelines|yaml invalid"
@@ -27206,6 +27209,12 @@ msgstr ""
 msgid "Pipeline|This change will not change the overall test coverage if merged."
 msgstr ""
 
+msgid "Pipeline|This pipeline ran on the contents of this merge request combined with the contents of all other merge requests queued for merging into the target branch."
+msgstr ""
+
+msgid "Pipeline|This pipeline ran on the contents of this merge request's source branch, not the target branch."
+msgstr ""
+
 msgid "Pipeline|Trigger author"
 msgstr ""
 
@@ -27230,6 +27239,12 @@ msgstr ""
 msgid "Pipeline|for"
 msgstr ""
 
+msgid "Pipeline|merge request"
+msgstr ""
+
+msgid "Pipeline|merge train"
+msgstr ""
+
 msgid "Pipeline|on"
 msgstr ""
 
@@ -37452,9 +37467,6 @@ msgstr ""
 msgid "This is a list of devices that have logged into your account. Revoke any sessions that you do not recognize."
 msgstr ""
 
-msgid "This is a merge train pipeline"
-msgstr ""
-
 msgid "This is a private email address %{helpIcon} generated just for you. Anyone who has it can create issues or merge requests as if they were you. If that happens, %{resetLinkStart}reset this token%{resetLinkEnd}."
 msgstr ""
 
@@ -43290,9 +43302,6 @@ msgstr ""
 msgid "design"
 msgstr ""
 
-msgid "detached"
-msgstr ""
-
 msgid "disabled"
 msgstr ""
 
@@ -44448,9 +44457,6 @@ msgstr ""
 msgid "toggle collapse"
 msgstr ""
 
-msgid "train"
-msgstr ""
-
 msgid "triggered"
 msgstr ""
 

spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb

@@ -25,6 +25,8 @@ RSpec.describe 'Merge request > User sees pipelines triggered by merge request',
     }
   end
 
+  let(:expected_detached_mr_tag) {'merge request'}
+
   before do
     stub_application_setting(auto_devops_enabled: false)
     stub_ci_pipeline_yaml_file(YAML.dump(config))
@@ -118,16 +120,16 @@ RSpec.describe 'Merge request > User sees pipelines triggered by merge request',
       it 'sees detached tag for detached merge request pipelines' do
         page.within('.ci-table') do
           expect(all('.pipeline-tags')[0])
-            .to have_content("detached")
+            .to have_content(expected_detached_mr_tag)
 
           expect(all('.pipeline-tags')[1])
-            .to have_content("detached")
+            .to have_content(expected_detached_mr_tag)
 
           expect(all('.pipeline-tags')[2])
-            .not_to have_content("detached")
+            .not_to have_content(expected_detached_mr_tag)
 
           expect(all('.pipeline-tags')[3])
-            .not_to have_content("detached")
+            .not_to have_content(expected_detached_mr_tag)
         end
       end
 
@@ -312,16 +314,16 @@ RSpec.describe 'Merge request > User sees pipelines triggered by merge request',
       it 'sees detached tag for detached merge request pipelines' do
         page.within('.ci-table') do
           expect(all('.pipeline-tags')[0])
-            .to have_content("detached")
+            .to have_content(expected_detached_mr_tag)
 
           expect(all('.pipeline-tags')[1])
-            .to have_content("detached")
+            .to have_content(expected_detached_mr_tag)
 
           expect(all('.pipeline-tags')[2])
-            .not_to have_content("detached")
+            .not_to have_content(expected_detached_mr_tag)
 
           expect(all('.pipeline-tags')[3])
-            .not_to have_content("detached")
+            .not_to have_content(expected_detached_mr_tag)
         end
       end
 

spec/features/merge_request/user_sees_pipelines_spec.rb

@@ -186,7 +186,7 @@ RSpec.describe 'Merge request > User sees pipelines', :js do
         page.within(first('.commit')) do
           page.within('.pipeline-tags') do
             expect(page.find('[data-testid="pipeline-url-link"]')[:href]).to include(expected_project.full_path)
-            expect(page).to have_content('detached')
+            expect(page).to have_content('merge request')
           end
           page.within('.pipeline-triggerer') do
             expect(page).to have_link(href: user_path(actor))

spec/features/projects/pipelines/pipeline_spec.rb

@@ -1413,7 +1413,7 @@ RSpec.describe 'Pipeline', :js do
 
       it 'contains badge that indicates detached merge request pipeline' do
         page.within(all('.well-segment')[1]) do
-          expect(page).to have_content 'detached'
+          expect(page).to have_content 'merge request'
         end
       end
     end

spec/features/projects/pipelines/pipelines_spec.rb

@@ -7,6 +7,7 @@ RSpec.describe 'Pipelines', :js do
   include Spec::Support::Helpers::ModalHelpers
 
   let(:project) { create(:project) }
+  let(:expected_detached_mr_tag) {'merge request'}
 
   context 'when user is logged in' do
     let(:user) { create(:user) }
@@ -181,7 +182,7 @@ RSpec.describe 'Pipelines', :js do
         shared_examples_for 'detached merge request pipeline' do
           it 'shows pipeline information without pipeline ref', :sidekiq_might_not_need_inline do
             within '.pipeline-tags' do
-              expect(page).to have_content('detached')
+              expect(page).to have_content(expected_detached_mr_tag)
             end
 
             within '.branch-commit' do
@@ -225,7 +226,7 @@ RSpec.describe 'Pipelines', :js do
         shared_examples_for 'detached merge request pipeline' do
           it 'shows pipeline information without pipeline ref', :sidekiq_might_not_need_inline do
             within '.pipeline-tags' do
-              expect(page).to have_content('detached')
+              expect(page).to have_content(expected_detached_mr_tag)
 
               expect(page).to have_link(merge_request.iid,
                                         href: project_merge_request_path(project, merge_request))
@@ -266,7 +267,7 @@ RSpec.describe 'Pipelines', :js do
         shared_examples_for 'Correct merge request pipeline information' do
           it 'does not show detached tag for the pipeline, and shows the link of the merge request, and does not show the ref of the pipeline', :sidekiq_might_not_need_inline do
             within '.pipeline-tags' do
-              expect(page).not_to have_content('detached')
+              expect(page).not_to have_content(expected_detached_mr_tag)
             end
 
             within '.branch-commit' do
@@ -311,7 +312,7 @@ RSpec.describe 'Pipelines', :js do
         shared_examples_for 'Correct merge request pipeline information' do
           it 'does not show detached tag for the pipeline, and shows the link of the merge request, and does not show the ref of the pipeline', :sidekiq_might_not_need_inline do
             within '.pipeline-tags' do
-              expect(page).not_to have_content('detached')
+              expect(page).not_to have_content(expected_detached_mr_tag)
 
               expect(page).to have_link(merge_request.iid,
                                         href: project_merge_request_path(project, merge_request))

spec/frontend/pipelines/pipeline_url_spec.js

@@ -132,7 +132,7 @@ describe('Pipeline Url Component', () => {
         ...detachedMRPipeline,
       });
 
-      expect(findDetachedTag().text()).toContain('detached');
+      expect(findDetachedTag().text()).toBe('merge request');
     });
 
     it('should render error badge when pipeline has a failure reason set', () => {
@@ -180,7 +180,7 @@ describe('Pipeline Url Component', () => {
         ...mergeTrainPipeline,
       });
 
-      expect(findTrainTag().text()).toContain('train');
+      expect(findTrainTag().text()).toBe('merge train');
     });
 
     it('should not render the train badge when the pipeline is not a merge train pipeline', () => {