Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/super_sidebar/components/context_switcher.vue

@@ -179,7 +179,7 @@ export default {
     <gl-alert v-else-if="hasError" variant="danger" :dismissible="false" class="gl-m-2">
       {{ $options.i18n.searchError }}
     </gl-alert>
-    <nav v-else :aria-label="$options.i18n.contextNavigation">
+    <nav v-else :aria-label="$options.i18n.contextNavigation" data-qa-selector="context_navigation">
       <ul class="gl-p-0 gl-m-0 gl-list-style-none">
         <li v-if="!isSearch">
           <div aria-hidden="true" class="gl-font-weight-bold gl-px-3 gl-py-3">

app/assets/javascripts/super_sidebar/components/context_switcher_toggle.vue

@@ -35,6 +35,7 @@ export default {
   <button
     type="button"
     class="context-switcher-toggle gl-p-0 gl-bg-transparent gl-hover-bg-t-gray-a-08 gl-focus-bg-t-gray-a-08 gl-border-0 border-top border-bottom gl-border-gray-a-08 gl-box-shadow-none gl-display-flex gl-align-items-center gl-font-weight-bold gl-w-full gl-h-8 gl-flex-shrink-0"
+    data-qa-selector="context_switcher"
   >
     <span
       v-if="context.icon"

app/assets/javascripts/super_sidebar/components/menu_section.vue

@@ -68,6 +68,8 @@ export default {
     <button
       class="gl-rounded-base gl-relative gl-display-flex gl-align-items-center gl-py-3 gl-px-0 gl-line-height-normal gl-text-black-normal! gl-hover-bg-t-gray-a-08 gl-text-decoration-none! gl-appearance-none gl-border-0 gl-bg-transparent gl-text-left gl-w-full gl-focus--focus"
       :class="computedLinkClasses"
+      data-qa-selector="menu_section_button"
+      :data-qa-section-name="item.title"
       @click="isExpanded = !isExpanded"
     >
       <span
@@ -91,7 +93,12 @@ export default {
       </span>
     </button>
 
-    <gl-collapse v-model="isExpanded" :aria-label="item.title">
+    <gl-collapse
+      v-model="isExpanded"
+      :aria-label="item.title"
+      data-qa-selector="menu_section"
+      :data-qa-section-name="item.title"
+    >
       <slot>
         <ul class="gl-list-style-none gl-p-0 gl-m-0">
           <nav-item

app/assets/javascripts/super_sidebar/components/nav_item.vue

@@ -116,7 +116,6 @@ export default {
       :class="computedLinkClasses"
       data-qa-selector="nav_item_link"
       data-testid="nav-item-link"
-      :data-qa-menu-item="item.title"
     >
       <div
         :class="[isActive ? 'gl-bg-blue-500' : 'gl-bg-transparent']"

doc/user/product_analytics/index.md

@@ -36,7 +36,7 @@ title: Product Analytics flow
 flowchart TB
     subgraph Adding data
         A([SDK]) --Send user data--> B[Analytics Proxy]
-        B --Transform data and pass it through--> C[Jitsu]
+        B --Transform data and pass it through--> C[Snowplow]
         C --Pass the data to the associated database--> D([Clickhouse])
     end
     subgraph Showing dashboards

lib/gitlab/ci/templates/Python.gitlab-ci.yml

@@ -23,26 +23,24 @@ cache:
     - venv/
 
 before_script:
-  - python --version  # For debugging
+  - python --version ; pip --version  # For debugging
   - pip install virtualenv
   - virtualenv venv
   - source venv/bin/activate
 
 test:
   script:
-    - python setup.py test
-    - pip install tox flake8  # you can also use tox
-    - tox -e py,flake8
+    - pip install ruff tox  # you can also use tox
+    - pip install --editable ".[test]"
+    - tox -e py,ruff
 
 run:
   script:
-    - python setup.py bdist_wheel
-    # an alternative approach is to install and run:
-    - pip install dist/*
+    - pip install .
     # run the command here
   artifacts:
     paths:
-      - dist/*.whl
+      - build/*
 
 pages:
   script:

qa/qa/page/sub_menus/common.rb

@@ -45,9 +45,9 @@ module QA
         # @param [String] sub_menu
         # @return [void]
         def open_submenu(parent_menu_name, sub_menu)
-          click_element(:nav_item_link, menu_item: parent_menu_name)
+          click_element(:menu_section_button, section_name: parent_menu_name)
 
-          within_element(:menu_section, section: parent_menu_name) do
+          within_element(:menu_section, section_name: parent_menu_name) do
             click_element(:nav_item_link, submenu_item: sub_menu)
           end
         end

qa/qa/page/sub_menus/super_sidebar/context_switcher.rb

@@ -11,9 +11,9 @@ module QA
             super
 
             base.class_eval do
-              view 'app/assets/javascripts/super_sidebar/components/super_sidebar.vue' do
+              view 'app/assets/javascripts/super_sidebar/components/context_switcher_toggle.vue' do
                 element :context_switcher
-                element :context_section
+                element :context_navigation
               end
             end
           end
@@ -27,17 +27,15 @@ module QA
           end
 
           def go_to_admin_area
-            go_to_context("Admin")
+            go_to_context("Admin Area")
           end
 
           private
 
           def go_to_context(sub_menu)
-            click_element(:context_switcher) unless has_element?(:context_section, wait: 0)
+            click_element(:context_switcher) unless has_element?(:context_navigation, wait: 0)
 
-            within_element(:context_section) do
-              click_element(:nav_item_link, submenu_item: sub_menu)
-            end
+            click_element(:nav_item_link, submenu_item: sub_menu)
           end
         end
       end