Automatic merge of gitlab-org/gitlab master

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

@@ -103,7 +103,7 @@ export default {
 <template>
   <gl-dropdown
     ref="dropdown"
-    v-gl-tooltip.hover
+    v-gl-tooltip.hover.ds0
     data-testid="mini-pipeline-graph-dropdown"
     :title="stage.title"
     variant="link"

app/views/admin/projects/index.html.haml

@@ -18,20 +18,20 @@
     .search-holder
       = render 'shared/projects/search_form', autofocus: true, admin_view: true
       .dropdown
-        - toggle_text = 'Namespace'
+        - toggle_text = _('Namespace')
         - if params[:namespace_id].present?
           = hidden_field_tag :namespace_id, params[:namespace_id]
           - namespace = Namespace.find(params[:namespace_id])
           - toggle_text = "#{namespace.kind}: #{namespace.full_path}"
         = dropdown_toggle(toggle_text, { toggle: 'dropdown', is_filter: 'true' }, { toggle_class: 'js-namespace-select large' })
         .dropdown-menu.dropdown-select.dropdown-menu-right
-          = dropdown_title('Namespaces')
-          = dropdown_filter("Search for Namespace")
+          = dropdown_title(_('Namespaces'))
+          = dropdown_filter(_("Search for Namespace"))
           = dropdown_content
           = dropdown_loading
       = render 'shared/projects/dropdown'
       = link_to new_project_path, class: 'gl-button btn btn-confirm' do
-        New Project
-      = button_tag "Search", class: "gl-button btn btn-confirm btn-search hide"
+        = _('New Project')
+      = button_tag _("Search"), class: "gl-button btn btn-confirm btn-search hide"
 
 = render 'projects'

app/views/registrations/welcome/show.html.haml

 - page_title _('Your profile')
 - add_page_specific_style 'page_bundles/signup'
+- gitlab_experience_text = _('To personalize your GitLab experience, we\'d like to know a bit more about you')
 
 .row.gl-flex-grow-1
   .d-flex.gl-flex-direction-column.gl-align-items-center.gl-w-full.gl-p-5
     .edit-profile.login-page.d-flex.flex-column.gl-align-items-center.pt-lg-3
       = render_if_exists "registrations/welcome/progress_bar"
       %h2.gl-text-center= html_escape(_('Welcome to GitLab,%{br_tag}%{name}!')) % { name: html_escape(current_user.first_name), br_tag: '<br/>'.html_safe }
-      %p.gl-text-center= html_escape(_('To personalize your GitLab experience, we\'d like to know a bit more about you. We won\'t share this information with anyone.')) % { br_tag: '<br/>'.html_safe }
+      - if Gitlab.com?
+        %p.gl-text-center= html_escape(_('%{gitlab_experience_text}. We won\'t share this information with anyone.')) % { gitlab_experience_text: gitlab_experience_text }
+      - else
+        %p.gl-text-center= html_escape(_('%{gitlab_experience_text}. Don\'t worry, this information isn\'t shared outside of your self-managed GitLab instance.')) % { gitlab_experience_text: gitlab_experience_text }
       = form_for(current_user, url: users_sign_up_welcome_path, html: { class: 'card gl-w-full! gl-p-5', 'aria-live' => 'assertive' }) do |f|
         .devise-errors
           = render 'devise/shared/error_messages', resource: current_user

changelogs/unreleased/Externalize-strings-in-projects-index-html-haml.yml

+---
+title: Externalize strings in projects/index.html.haml
+merge_request: 58160
+author: nuwe1
+type: other

changelogs/unreleased/nicolasdular-welcome-page-text-change.yml

+---
+title: Clarify on welcome page that we do not share any data
+merge_request: 59183
+author:
+type: changed

changelogs/unreleased/reduce-pipline-tooltip-delay-to-zero.yml

+---
+title: Reduce pipeline tooltip delay to 0
+merge_request: 59155
+author:
+type: changed

locale/gitlab.pot

@@ -539,6 +539,12 @@ msgstr ""
 msgid "%{firstMilestoneName} + %{numberOfOtherMilestones} more"
 msgstr ""
 
+msgid "%{gitlab_experience_text}. Don't worry, this information isn't shared outside of your self-managed GitLab instance."
+msgstr ""
+
+msgid "%{gitlab_experience_text}. We won't share this information with anyone."
+msgstr ""
+
 msgid "%{global_id} is not a valid ID for %{expected_type}."
 msgstr ""
 
@@ -32579,7 +32585,7 @@ msgstr ""
 msgid "To pass variables to the triggered pipeline, add %{code_start}variables[VARIABLE]=VALUE%{code_end} to the API request."
 msgstr ""
 
-msgid "To personalize your GitLab experience, we'd like to know a bit more about you. We won't share this information with anyone."
+msgid "To personalize your GitLab experience, we'd like to know a bit more about you"
 msgstr ""
 
 msgid "To preserve performance only %{strong_open}%{display_size} of %{real_size}%{strong_close} files are displayed."

spec/frontend/pipelines/components/pipelines_list/pipeline_stage_spec.js

@@ -11,10 +11,15 @@ const dropdownPath = 'path.json';
 describe('Pipelines stage component', () => {
   let wrapper;
   let mock;
+  let glTooltipDirectiveMock;
 
   const createComponent = (props = {}) => {
+    glTooltipDirectiveMock = jest.fn();
     wrapper = mount(PipelineStage, {
       attachTo: document.body,
+      directives: {
+        GlTooltip: glTooltipDirectiveMock,
+      },
       propsData: {
         stage: {
           status: {
@@ -62,6 +67,10 @@ describe('Pipelines stage component', () => {
       createComponent();
     });
 
+    it('sets up the tooltip to not have a show delay animation', () => {
+      expect(glTooltipDirectiveMock.mock.calls[0][1].modifiers.ds0).toBe(true);
+    });
+
     it('should render a dropdown with the status icon', () => {
       expect(findDropdown().exists()).toBe(true);
       expect(findDropdownToggle().exists()).toBe(true);