.gitlab/CODEOWNERS

@@ -1384,7 +1384,7 @@ lib/api/entities/project_identity.rb
 lib/api/entities/project.rb
 ee/lib/ee/api/entities/project.rb
 
-[Compliance] @gitlab-org/govern/compliance
+[Compliance] @gitlab-org/govern/compliance/engineering
 /app/services/audit_events/build_service.rb
 /ee/app/services/ee/audit_events/build_service.rb
 /ee/spec/services/audit_events/custom_audit_event_service_spec.rb

.gitlab/ci/preflight.gitlab-ci.yml

@@ -77,5 +77,5 @@ qa:selectors:
 qa:selectors-as-if-foss:
   extends:
     - qa:selectors
-    - .qa:rules:as-if-foss
+    - .qa:rules:selectors-as-if-foss
     - .as-if-foss

.gitlab/ci/qa-common/main.gitlab-ci.yml

@@ -86,11 +86,11 @@ stages:
     KNAPSACK_DIR: ${CI_PROJECT_DIR}/qa/knapsack
     GIT_STRATEGY: none
   script:
-    - echo "KNAPSACK_TEST_FILE_PATTERN is ${KNAPSACK_TEST_FILE_PATTERN}"
-    # when using qa-image, code runs in /home/gitlab/qa folder
     - bundle exec rake "knapsack:download[test]"
-    - '[ -n "$QA_TESTS" ] && bundle exec rake "knapsack:create_reports_for_selective"'
-    - mkdir -p "$KNAPSACK_DIR" && cp knapsack/*.json "${KNAPSACK_DIR}/"
+    - bundle exec rake "knapsack:create_reports_for_selective"
+  after_script:
+    # when using qa-image, code runs in /home/gitlab/qa folder
+    - mkdir -p "$KNAPSACK_DIR" && cp /home/gitlab/qa/knapsack/*.json "${KNAPSACK_DIR}/"
   allow_failure: true
   artifacts:
     paths:

.gitlab/ci/rules.gitlab-ci.yml

@@ -418,6 +418,12 @@
   - ".dockerignore"
   - "{,jh/}qa/**/*"
 
+# Frontend view patterns + .qa-patterns
+.frontend-qa-patterns: &frontend-qa-patterns
+  - "{,ee/,jh/}{app/assets,app/components,app/helpers,app/presenters,app/views}/**/*"
+  # QA changes
+  - "{,jh/}qa/**/*"
+
 # Code patterns + .ci-patterns
 .code-patterns: &code-patterns
   - "{package.json,yarn.lock}"
@@ -1445,7 +1451,7 @@
 ############
 .qa:rules:update-gem-cache:
   rules:
-    - <<: *if-default-refs
+    - if: '$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH || $CI_COMMIT_REF_NAME =~ /^[\d-]+-stable(-ee)?$/ || $CI_COMMIT_REF_NAME =~ /^\d+-\d+-auto-deploy-\d+$/ || $CI_COMMIT_REF_NAME =~ /^security\//'
       changes:
         - qa/Gemfile.lock
     - <<: *if-schedule-maintenance
@@ -1470,11 +1476,11 @@
     - <<: *if-default-refs
       changes: *code-qa-patterns
 
-.qa:rules:as-if-foss:
+.qa:rules:selectors-as-if-foss:
   rules:
     - !reference [".strict-ee-only-rules", rules]
-    - <<: *if-security-merge-request
-      changes: *code-qa-patterns
+    - <<: *if-merge-request
+      changes: *frontend-qa-patterns
     - <<: *if-merge-request-labels-as-if-foss
     - <<: *if-merge-request-labels-run-all-rspec
 

.gitlab/ci/test-on-gdk/main.gitlab-ci.yml

@@ -3,18 +3,6 @@ include:
   - local: .gitlab/ci/qa-common/main.gitlab-ci.yml
   - local: .gitlab/ci/qa-common/rules.gitlab-ci.yml
   - local: .gitlab/ci/qa-common/variables.gitlab-ci.yml
-  - component: "gitlab.com/gitlab-org/quality/pipeline-common/allure-report@7.3.0"
-    inputs:
-      job_name: "e2e-test-report"
-      job_stage: "report"
-      aws_access_key_id_variable_name: "QA_ALLURE_AWS_ACCESS_KEY_ID"
-      aws_secret_access_key_variable_name: "QA_ALLURE_AWS_SECRET_ACCESS_KEY"
-      gitlab_auth_token_variable_name: "PROJECT_TOKEN_FOR_CI_SCRIPTS_API_USAGE"
-      allure_results_glob: "qa/tmp/allure-results"
-      allure_ref_slug: "${CI_COMMIT_REF_SLUG}"
-      allure_project_path: "${CI_PROJECT_PATH}"
-      allure_merge_request_iid: "${CI_MERGE_REQUEST_IID}"
-      allure_job_name: "${QA_RUN_TYPE}"
 
 # code pattern changes
 .code-pattern-changes: &code-pattern-changes
@@ -24,12 +12,6 @@ include:
 .qa-run-all-tests: &qa-run-all-tests
   if: $QA_FRAMEWORK_CHANGES == "true" || $QA_RUN_ALL_TESTS == "true" || $QA_RUN_ALL_E2E_LABEL == "true" || $QA_FEATURE_FLAGS =~ /deleted/
 
-variables:
-  COLORIZED_LOGS: "true"
-  GIT_DEPTH: "20"
-  GIT_STRATEGY: "clone"  # 'GIT_STRATEGY: clone' optimizes the pack-objects cache hit ratio
-  GIT_SUBMODULE_STRATEGY: "none"
-
 .rules:gdk:qa-selective:
   rules:
     - <<: *code-pattern-changes
@@ -42,6 +24,7 @@ variables:
     - *code-pattern-changes
     - !reference [.rules:test:qa-parallel, rules]
     - if: $QA_SUITES =~ /Test::Instance::Blocking/
+    - !reference [.rules:test:manual, rules]
 
 .rules:gdk:qa-smoke:
   rules:
@@ -52,6 +35,7 @@ variables:
       variables:
         QA_TESTS: ""
     - if: $QA_SUITES =~ /Test::Instance::Smoke/
+    - !reference [.rules:test:manual, rules]
 
 .gdk-qa-base:
   image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}:bundler-2.3-git-2.36-lfs-2.9-chrome-${CHROME_VERSION}-docker-${DOCKER_VERSION}-gcloud-383-kubectl-1.23
@@ -119,11 +103,6 @@ variables:
     expire_in: 7 days
     when: always
 
-download-knapsack-report:
-  extends:
-    - .download-knapsack-report
-    - .rules:download-knapsack
-
 # Take the existing GDK docker image and reconfigure it with Postgres load
 # balancing. Adding 5s lag to 1 of the replicas to validate robustness of
 # the load balancer.
@@ -138,11 +117,31 @@ download-knapsack-report:
         gdk reconfigure &&\
         gdk restart"
 
+# ==========================================
+# Pre stage
+# ==========================================
+# override .download-knapsack-report job to not depend on qa-image build
+download-knapsack-report:
+  extends:
+    - .download-knapsack-report
+    - .ruby-image
+    - .bundler-variables
+    - .qa-cache
+    - .rules:download-knapsack
+  variables:
+    GIT_STRATEGY: clone
+  before_script:
+    - cd qa && bundle install
+  after_script: []
+
 download-fast-quarantine-report:
   extends:
     - .download-fast-quarantine-report
     - .rules:download-fast-quarantine-report
 
+# ==========================================
+# Test stage
+# ==========================================
 gdk-qa-smoke:
   extends:
     - .gdk-qa-base
@@ -223,6 +222,8 @@ gdk-qa-non-blocking:
 # ==========================================
 e2e-test-report:
   extends: .rules:report:allure-report
+  variables:
+    ALLURE_REPORT_RESULTS_GLOB: "qa/tmp/allure-results"
 
 upload-knapsack-report:
   extends:

.gitlab/ci/workhorse.gitlab-ci.yml

@@ -33,7 +33,7 @@ workhorse:test go:
   extends: .workhorse:test
   parallel:
     matrix:
-      - GO_VERSION: ["1.19", "1.20", "1.21"]
+      - GO_VERSION: ["1.20", "1.21"]
         REDIS_VERSION: ["7.0", "6.2"]
   script:
     - make -C workhorse test-coverage

.rubocop_todo/rspec/feature_category.yml

@@ -611,10 +611,6 @@ RSpec/FeatureCategory:
     - 'ee/spec/lib/ee/gitlab/background_migration/migrate_shared_vulnerability_scanners_spec.rb'
     - 'ee/spec/lib/ee/gitlab/background_migration/populate_approval_merge_request_rules_with_security_orchestration_spec.rb'
     - 'ee/spec/lib/ee/gitlab/background_migration/populate_approval_project_rules_with_security_orchestration_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/checks/push_rules/branch_check_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/checks/push_rules/commit_check_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/checks/push_rules/file_size_check_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/checks/push_rules/tag_check_spec.rb'
     - 'ee/spec/lib/ee/gitlab/ci/config/entry/bridge_spec.rb'
     - 'ee/spec/lib/ee/gitlab/ci/config/entry/need_spec.rb'
     - 'ee/spec/lib/ee/gitlab/ci/config/entry/needs_spec.rb'
@@ -747,8 +743,6 @@ RSpec/FeatureCategory:
     - 'ee/spec/lib/gitlab/authority_analyzer_spec.rb'
     - 'ee/spec/lib/gitlab/bullet/exclusions_spec.rb'
     - 'ee/spec/lib/gitlab/cache_spec.rb'
-    - 'ee/spec/lib/gitlab/checks/changes_access_spec.rb'
-    - 'ee/spec/lib/gitlab/checks/diff_check_spec.rb'
     - 'ee/spec/lib/gitlab/ci/config/entry/dast_configuration_spec.rb'
     - 'ee/spec/lib/gitlab/ci/config/entry/job_spec.rb'
     - 'ee/spec/lib/gitlab/ci/config/entry/secret_spec.rb'
@@ -2888,19 +2882,6 @@ RSpec/FeatureCategory:
     - 'spec/lib/gitlab/chat/responder/mattermost_spec.rb'
     - 'spec/lib/gitlab/chat/responder/slack_spec.rb'
     - 'spec/lib/gitlab/chat_name_token_spec.rb'
-    - 'spec/lib/gitlab/checks/branch_check_spec.rb'
-    - 'spec/lib/gitlab/checks/container_moved_spec.rb'
-    - 'spec/lib/gitlab/checks/force_push_spec.rb'
-    - 'spec/lib/gitlab/checks/lfs_check_spec.rb'
-    - 'spec/lib/gitlab/checks/lfs_integrity_spec.rb'
-    - 'spec/lib/gitlab/checks/matching_merge_request_spec.rb'
-    - 'spec/lib/gitlab/checks/project_created_spec.rb'
-    - 'spec/lib/gitlab/checks/push_check_spec.rb'
-    - 'spec/lib/gitlab/checks/push_file_count_check_spec.rb'
-    - 'spec/lib/gitlab/checks/single_change_access_spec.rb'
-    - 'spec/lib/gitlab/checks/snippet_check_spec.rb'
-    - 'spec/lib/gitlab/checks/tag_check_spec.rb'
-    - 'spec/lib/gitlab/checks/timed_logger_spec.rb'
     - 'spec/lib/gitlab/ci/ansi2html_spec.rb'
     - 'spec/lib/gitlab/ci/ansi2json/line_spec.rb'
     - 'spec/lib/gitlab/ci/ansi2json/parser_spec.rb'

GITLAB_KAS_VERSION

-v16.6.0
+v16.7.0-rc2

Gemfile

@@ -199,9 +199,9 @@ gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'elasticsearch-model', '~> 7.2' # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'elasticsearch-api',   '7.13.3' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'aws-sdk-core', '~> 3.187.1' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'aws-sdk-core', '~> 3.188.0' # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'aws-sdk-s3', '~> 1.137.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'aws-sdk-s3', '~> 1.139.0' # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # rubocop:todo Gemfile/MissingFeatureCategory
 
@@ -221,7 +221,7 @@ gem 'asciidoctor-plantuml', '~> 0.0.16' # rubocop:todo Gemfile/MissingFeatureCat
 gem 'asciidoctor-kroki', '~> 0.8.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'rouge', '~> 4.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'truncato', '~> 0.7.12' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'nokogiri', '~> 1.15', '>= 1.15.4' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'nokogiri', '~> 1.15', '>= 1.15.5' # rubocop:todo Gemfile/MissingFeatureCategory
 
 # Calendar rendering
 gem 'icalendar' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -264,7 +264,7 @@ gem 'rainbow', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'ruby-progressbar', '~> 1.10' # rubocop:todo Gemfile/MissingFeatureCategory
 
 # Linear-time regex library for untrusted regular expressions
-gem 're2', '2.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 're2', '2.4.3' # rubocop:todo Gemfile/MissingFeatureCategory
 
 # Misc
 
@@ -310,7 +310,7 @@ gem 'sanitize', '~> 6.0.2' # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'babosa', '~> 2.0' # rubocop:todo Gemfile/MissingFeatureCategory
 
 # Sanitizes SVG input
-gem 'loofah', '~> 2.21.4' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'loofah', '~> 2.22.0' # rubocop:todo Gemfile/MissingFeatureCategory
 
 # Used to provide license templates
 gem 'licensee', '~> 9.16' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -347,10 +347,10 @@ gem 'gitlab-license', '~> 2.3' # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'rack-attack', '~> 6.7.0' # rubocop:todo Gemfile/MissingFeatureCategory
 
 # Sentry integration
-gem 'sentry-raven', '~> 3.1' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'sentry-ruby', '~> 5.8.0' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'sentry-rails', '~> 5.8.0' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'sentry-sidekiq', '~> 5.8.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'sentry-raven', '~> 3.1', feature_category: :error_tracking
+gem 'sentry-ruby', '~> 5.10.0', feature_category: :error_tracking
+gem 'sentry-rails', '~> 5.10.0', feature_category: :error_tracking
+gem 'sentry-sidekiq', '~> 5.10.0', feature_category: :error_tracking
 
 # PostgreSQL query parsing
 #
@@ -420,7 +420,7 @@ group :development, :test do
 
   gem 'database_cleaner-active_record', '~> 2.1.0', feature_category: :database
   gem 'factory_bot_rails', '~> 6.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
-  gem 'rspec-rails', '~> 6.0.3' # rubocop:todo Gemfile/MissingFeatureCategory
+  gem 'rspec-rails', '~> 6.1.0', feature_category: :shared
 
   # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
   gem 'minitest', '~> 5.11.0' # rubocop:todo Gemfile/MissingFeatureCategory

Gemfile.checksum

@@ -37,9 +37,9 @@
 {"name":"aws-eventstream","version":"1.2.0","platform":"ruby","checksum":"ffa53482c92880b001ff2fb06919b9bb82fd847cbb0fa244985d2ebb6dd0d1df"},
 {"name":"aws-partitions","version":"1.761.0","platform":"ruby","checksum":"291e444e1edfc92c5521a6dbdd1236ccc3f122b3520163b2be6ec5b6ef350ef2"},
 {"name":"aws-sdk-cloudformation","version":"1.41.0","platform":"ruby","checksum":"31e47539719734413671edf9b1a31f8673fbf9688549f50c41affabbcb1c6b26"},
-{"name":"aws-sdk-core","version":"3.187.1","platform":"ruby","checksum":"bcc4f075b172430df9a147a6d9c615b4915ad112316199092f8bc8edd5a1bb15"},
+{"name":"aws-sdk-core","version":"3.188.0","platform":"ruby","checksum":"67b785c60466e5f459e250a38f55f5170ab6723db8740157bb6b06a7888d6337"},
 {"name":"aws-sdk-kms","version":"1.64.0","platform":"ruby","checksum":"40de596c95047bfc6e1aacea24f3df6241aa716b6f7ce08ac4c5f7e3120395ad"},
-{"name":"aws-sdk-s3","version":"1.137.0","platform":"ruby","checksum":"580011295202bf134d62473916933ef00ad9b9076264d8de8bd00e3c4e5bebab"},
+{"name":"aws-sdk-s3","version":"1.139.0","platform":"ruby","checksum":"a7cf63382f93c5790687371daa6723101db8976aa6a9a4ba7f2305a2103fc87b"},
 {"name":"aws-sigv4","version":"1.6.0","platform":"ruby","checksum":"ca9e6a15cd424f1f32b524b9760995331459bc22e67d3daad4fcf0c0084b087d"},
 {"name":"axe-core-api","version":"4.6.0","platform":"ruby","checksum":"1b0ddec3353f108dc10363baf2282f43a5ff7f13d4e25f99071294e78f8a6c62"},
 {"name":"axe-core-rspec","version":"4.6.0","platform":"ruby","checksum":"11c25bc9dd388c137ba4e5e63d64d20092bf22c884d8ffc829a22acfbacd747f"},
@@ -205,7 +205,6 @@
 {"name":"get_process_mem","version":"0.2.7","platform":"ruby","checksum":"4afd3c3641dd6a817c09806c7d6d509d8a9984512ac38dea8b917426bbf77eba"},
 {"name":"gettext","version":"3.4.9","platform":"ruby","checksum":"292864fe6a15c224cee4125a4a72fab426fdbb280e4cff3cfe44935f549b009a"},
 {"name":"gettext_i18n_rails","version":"1.11.0","platform":"ruby","checksum":"e19c7e4a256c500f7f38396dca44a282b9838ae278f57c362993a54964b22bbe"},
-{"name":"gettext_i18n_rails_js","version":"2.0.0","platform":"ruby","checksum":"7bfb72699e3cdf9a2d892cc816e70442a08d0f4e340b92731249ad38b9205b51"},
 {"name":"git","version":"1.18.0","platform":"ruby","checksum":"c9b80462e4565cd3d7a9ba8440c41d2c52244b17b0dad0bfddb46de70630c465"},
 {"name":"gitaly","version":"16.5.0.pre.rc1","platform":"ruby","checksum":"ed17515ad04d4663a0efc15c8f2887b705f006133e8b10cc9321460eb0a38353"},
 {"name":"gitlab","version":"4.19.0","platform":"ruby","checksum":"3f645e3e195dbc24f0834fbf83e8ccfb2056d8e9712b01a640aad418a6949679"},
@@ -347,7 +346,7 @@
 {"name":"locale","version":"2.1.3","platform":"ruby","checksum":"b6ddee011e157817cb98e521b3ce7cb626424d5882f1e844aafdee3e8b212725"},
 {"name":"lockbox","version":"1.3.0","platform":"ruby","checksum":"ca8e5806e4e0c56d1d762ac5cf401940ff53fc37554ef623d3313c7a6331a3ea"},
 {"name":"lograge","version":"0.11.2","platform":"ruby","checksum":"4cbd1554b86f545d795eff15a0c24fd25057d2ac4e1caa5fc186168b3da932ef"},
-{"name":"loofah","version":"2.21.4","platform":"ruby","checksum":"2c18cd5db9fd92a48a270344e57a5b84cf22d668b78e1481f10e4f2cde4eb734"},
+{"name":"loofah","version":"2.22.0","platform":"ruby","checksum":"10d76e070c86b12fec74b6a9515fd1940f4459198b991342d0a7897d86c372fe"},
 {"name":"lookbook","version":"2.0.1","platform":"ruby","checksum":"0f14729c8c992810de0792a0be865a5792e5765fbaea5950cce74c6e5c73fc4a"},
 {"name":"lru_redux","version":"1.1.0","platform":"ruby","checksum":"ee71d0ccab164c51de146c27b480a68b3631d5b4297b8ffe8eda1c72de87affb"},
 {"name":"lumberjack","version":"1.2.7","platform":"ruby","checksum":"a5c6aae6b4234f1420dbcd80b23e3bca0817bd239440dde097ebe3fa63c63b1f"},
@@ -397,17 +396,17 @@
 {"name":"nio4r","version":"2.5.8","platform":"java","checksum":"b2b1800f6bf7ce4b797ca8b639ad278a99c9c904fb087a91d944f38e4bd71401"},
 {"name":"nio4r","version":"2.5.8","platform":"ruby","checksum":"3becb4ad95ab8ac0a9bd2e1b16466869402be62848082bf6329ae9091f276676"},
 {"name":"no_proxy_fix","version":"0.1.2","platform":"ruby","checksum":"4e9b4c31bb146de7fcf347dc1087bb13ac2039b56d50aa019e61036256abcd00"},
-{"name":"nokogiri","version":"1.15.4","platform":"aarch64-linux","checksum":"14091a07e07045a440213f7d5ced732fa7654ae8b6c7d180137f4124c5284ab8"},
-{"name":"nokogiri","version":"1.15.4","platform":"arm-linux","checksum":"572ddc19934d010e98821a946d89462ae66b310fecc3fe12c48b0025c2f76855"},
-{"name":"nokogiri","version":"1.15.4","platform":"arm64-darwin","checksum":"707288e293f4fc82a008f90b7ba0180d9f803f6a239a13e424378fedf8cf93e9"},
-{"name":"nokogiri","version":"1.15.4","platform":"java","checksum":"04745925f63af61144eccef38a703928629cf97c34dbb1c42e3def17ac77ec92"},
-{"name":"nokogiri","version":"1.15.4","platform":"ruby","checksum":"e4a801e5ef643cc0036f0a7e93433d18818b31d48c9c287596b68e92c0173c4d"},
-{"name":"nokogiri","version":"1.15.4","platform":"x64-mingw-ucrt","checksum":"a0bfb65461a0453afed1a41b235fe84d5b9c7f4d70afd45f0dc2fdec8909faf1"},
-{"name":"nokogiri","version":"1.15.4","platform":"x64-mingw32","checksum":"b9d01b9202e33cc23d19b2c1fc18ff4029cdda9b4f937a4baaefd4124a2158ba"},
-{"name":"nokogiri","version":"1.15.4","platform":"x86-linux","checksum":"f6ae258d7ed5f81715118282aa45486e68fd44b9747d0244a236e9ed5b94c45d"},
-{"name":"nokogiri","version":"1.15.4","platform":"x86-mingw32","checksum":"3f65b2426ece8da908bd5df5b6262ce525393f5245f8258a245bb4c3f5759b98"},
-{"name":"nokogiri","version":"1.15.4","platform":"x86_64-darwin","checksum":"d756605c540034debd7f486ae27802e6b1b129013fd6b1bb823783ef6f2bc5d7"},
-{"name":"nokogiri","version":"1.15.4","platform":"x86_64-linux","checksum":"872ced3d72d797ed9b5a76c67141c6cee7589711358e11c73e9c53724ffd1842"},
+{"name":"nokogiri","version":"1.15.5","platform":"aarch64-linux","checksum":"6dfa1d9837ddb233e234d56e244560ab1bc545d3d1744478060e18691f44ded7"},
+{"name":"nokogiri","version":"1.15.5","platform":"arm-linux","checksum":"e3ac6608c6e1714bc11ff04e29a43fedf4cac2aea1bd88256cc3b927c06f347f"},
+{"name":"nokogiri","version":"1.15.5","platform":"arm64-darwin","checksum":"4d7b15d53c0397d131376a19875aa97dd1c8b404c2c03bd2171f9b77e9592d40"},
+{"name":"nokogiri","version":"1.15.5","platform":"java","checksum":"5f87e71aaeb4f7479b94698737a0aacea77836b4805c7433b655e9565bd56cfe"},
+{"name":"nokogiri","version":"1.15.5","platform":"ruby","checksum":"22448ca35dbcbdcec60dbe25ccf452b685a5436c28f21b2fec2e20917aba9100"},
+{"name":"nokogiri","version":"1.15.5","platform":"x64-mingw-ucrt","checksum":"7612be800909ae51e0a7cfbe1f768757857a9ff0339686814ca67d9bae271ca2"},
+{"name":"nokogiri","version":"1.15.5","platform":"x64-mingw32","checksum":"28fd78d98e12005fe017db5ceccb74b2497f30582e6e26a3344200625fe46aae"},
+{"name":"nokogiri","version":"1.15.5","platform":"x86-linux","checksum":"0d1b564d7f148a6766380966bb48b23afa72c72c992c69c71d21acd4a7f5c0e4"},
+{"name":"nokogiri","version":"1.15.5","platform":"x86-mingw32","checksum":"d27dbf44c19b83e570e65b660a8a921441d1e8b6063ab1b985b516f78e0a2854"},
+{"name":"nokogiri","version":"1.15.5","platform":"x86_64-darwin","checksum":"10bafa54935f68aebd23235cb0fc7dfb8f6f5e52131379484771247eb3a0cc70"},
+{"name":"nokogiri","version":"1.15.5","platform":"x86_64-linux","checksum":"c5d9453cc155dc15f08ac699cc1293fd994ec6cfacec48e67653aa95ee946adf"},
 {"name":"notiffany","version":"0.1.3","platform":"ruby","checksum":"d37669605b7f8dcb04e004e6373e2a780b98c776f8eb503ac9578557d7808738"},
 {"name":"numerizer","version":"0.2.0","platform":"ruby","checksum":"e58076d5ee5370417b7e52d9cb25836d62acd1b8d9a194c308707986c1705d7b"},
 {"name":"oauth","version":"0.5.6","platform":"ruby","checksum":"4085fe28e0c5e2434135e00a6555294fd2a4ff96a98d1bdecdcd619fc6368dff"},
@@ -453,7 +452,6 @@
 {"name":"pg_query","version":"4.2.3","platform":"ruby","checksum":"1cc9955c7bce8e51e1abc11f1952e3d9d0f1cd4c16c58c56ec75d5aaf1cfd697"},
 {"name":"plist","version":"3.7.0","platform":"ruby","checksum":"703ca90a7cb00e8263edd03da2266627f6741d280c910abbbac07c95ffb2f073"},
 {"name":"png_quantizator","version":"0.2.1","platform":"ruby","checksum":"6023d4d064125c3a7e02929c95b7320ed6ac0d7341f9e8de0c9ea6576ef3106b"},
-{"name":"po_to_json","version":"2.0.0","platform":"ruby","checksum":"9e59b2904c015d2fcad3ec02022970ad0fb6622f6eb5ba82b47dff99d2fd6b2a"},
 {"name":"premailer","version":"1.16.0","platform":"ruby","checksum":"03e4402c448e6bae13fb5f6301a8bde4f3508e1bff90ae7c0972c7be94694786"},
 {"name":"premailer-rails","version":"1.10.3","platform":"ruby","checksum":"7cdcb97027866f7a81c490c6d15ada7f39666b5f6375f0821b7e97e0483b112f"},
 {"name":"prime","version":"0.1.2","platform":"ruby","checksum":"d4e956cadfaf04de036dc7dc74f95bf6a285a62cc509b28b7a66b245d19fe3a4"},
@@ -500,16 +498,16 @@
 {"name":"rbtrace","version":"0.4.14","platform":"ruby","checksum":"162bbf89cecabfc4f09c869b655f6f3a679c4870ebb7cbdcadf7393a81cc1769"},
 {"name":"rbtree","version":"0.4.6","platform":"ruby","checksum":"14eea4469b24fd2472542e5f3eb105d6344c8ccf36f0b56d55fdcfeb4e0f10fc"},
 {"name":"rchardet","version":"1.8.0","platform":"ruby","checksum":"693acd5253d5ade81a51940697955f6dd4bb2f0d245bda76a8e23deec70a52c7"},
-{"name":"re2","version":"2.3.0","platform":"aarch64-linux","checksum":"a5481148af570cac64196de1c2b87409e731181d8688885cf0e9633e1b19cccf"},
-{"name":"re2","version":"2.3.0","platform":"arm-linux","checksum":"93a973fa68ceee1ba34b12fe45131e3a3dde33b034b3b38f68dbcfac4da9ab9e"},
-{"name":"re2","version":"2.3.0","platform":"arm64-darwin","checksum":"bce955006e6efd9d6c45d98b00a7aa7af2d2465e983c1794e82eef0356fc7331"},
-{"name":"re2","version":"2.3.0","platform":"ruby","checksum":"15021a0e80f3b8934d6709c3ae410570c187625d46e24d4d8d472d5ef400a274"},
-{"name":"re2","version":"2.3.0","platform":"x64-mingw-ucrt","checksum":"b26623ed48eb9b5463658cd7fcac7a65fbe2be95731d5b6dcdf9c50dce4c3071"},
-{"name":"re2","version":"2.3.0","platform":"x64-mingw32","checksum":"95555a31d418ae54e77a35bf9cee248ba1633e4c076445ee3bbde31c692a9973"},
-{"name":"re2","version":"2.3.0","platform":"x86-linux","checksum":"2e693b321dada711e97f492172ad7dabb3ffa687758979ba08f2c68f170b1a55"},
-{"name":"re2","version":"2.3.0","platform":"x86-mingw32","checksum":"be81627fc0b2360ba14638b421d89f14410cd3c56924b9f6b5114170726b077d"},
-{"name":"re2","version":"2.3.0","platform":"x86_64-darwin","checksum":"b87a3920333363dc18fd898737a8e892ead62a81805fe829d9804e36d05f350b"},
-{"name":"re2","version":"2.3.0","platform":"x86_64-linux","checksum":"b0953007ffc5683c587db62fd5f2e4d332d8577b23d7ea611b5ea5c1f521337e"},
+{"name":"re2","version":"2.4.3","platform":"aarch64-linux","checksum":"c61f88ed98553b67b5dcf89fcce4394845b51697983b50b59c8cbff438b2f43d"},
+{"name":"re2","version":"2.4.3","platform":"arm-linux","checksum":"12a9f7044b8667bd0b95115576d811fa22d370203b31452212f69b397b10c1c1"},
+{"name":"re2","version":"2.4.3","platform":"arm64-darwin","checksum":"3ea5da85de0b7d8dd9a871bc939fd340c47e52925a2f7786602bb0e9b558d3b1"},
+{"name":"re2","version":"2.4.3","platform":"ruby","checksum":"4b38ed4b8b3b75dd4fb02d5966b44a3a0d9b9c97d6ef98d264da39dc1a0d702d"},
+{"name":"re2","version":"2.4.3","platform":"x64-mingw-ucrt","checksum":"12a4b345e013693d5bb974d6a975f3a192d0961394986a98063a317bfaf193ad"},
+{"name":"re2","version":"2.4.3","platform":"x64-mingw32","checksum":"e7fef971923684598f3cdf2efa694c54681ef07c2f332b2109f7f9249d672f0c"},
+{"name":"re2","version":"2.4.3","platform":"x86-linux","checksum":"7783d5f18781bf9f73b27d616d10660f2604b9c0f869fe86b702393eb070d49c"},
+{"name":"re2","version":"2.4.3","platform":"x86-mingw32","checksum":"15a3c849cea067c5d71915231541e00753c69234ac403fc497bb55ee3878591a"},
+{"name":"re2","version":"2.4.3","platform":"x86_64-darwin","checksum":"4e695cfe5bf6297dfd78ed02ddb4e5cff39ff045aa59d1dc59e203530b073576"},
+{"name":"re2","version":"2.4.3","platform":"x86_64-linux","checksum":"8ec7616e492881b7703cb07ed2890d7b77b0af553415bf79b19ce6ef5e5c5fed"},
 {"name":"recaptcha","version":"5.12.3","platform":"ruby","checksum":"37d1894add9e70a54d0c6c7f0ecbeedffbfa7d075acfbd4c509818dfdebdb7ee"},
 {"name":"recursive-open-struct","version":"1.1.3","platform":"ruby","checksum":"a3538a72552fcebcd0ada657bdff313641a4a5fbc482c08cfb9a65acb1c9de5a"},
 {"name":"redcarpet","version":"3.6.0","platform":"ruby","checksum":"8ad1889c0355ff4c47174af14edd06d62f45a326da1da6e8a121d59bdcd2e9e9"},
@@ -543,7 +541,7 @@
 {"name":"rspec-parameterized","version":"1.0.0","platform":"ruby","checksum":"9c07b043c72afbd23dd9a1dd48c06f46bc2fb1a6d875c6703e254932ba28b386"},
 {"name":"rspec-parameterized-core","version":"1.0.0","platform":"ruby","checksum":"287b494985e79821160af63aba4f91db8dbfa9a21cb200db34ba38f40e16ccc1"},
 {"name":"rspec-parameterized-table_syntax","version":"1.0.0","platform":"ruby","checksum":"d7df951eff9c5dd367ca7d5f9ae4853bb7ab7941f9d5b35bba361d112704988c"},
-{"name":"rspec-rails","version":"6.0.3","platform":"ruby","checksum":"6d1812cfaf18dba5a08d7e30c85149b24a220fae064853a96e451376be6fd820"},
+{"name":"rspec-rails","version":"6.1.0","platform":"ruby","checksum":"be86f73de238d40aad02e6acfc0f6d06edbd5cba4e310086e5516aae045ef5b6"},
 {"name":"rspec-retry","version":"0.6.2","platform":"ruby","checksum":"6101ba23a38809811ae3484acde4ab481c54d846ac66d5037ccb40131a60d858"},
 {"name":"rspec-support","version":"3.12.0","platform":"ruby","checksum":"dd4d44b247ff679b95b5607ac5641d197a5f9b1d33f916123cb98fc5f917c58b"},
 {"name":"rspec_junit_formatter","version":"0.6.0","platform":"ruby","checksum":"40dde674e6ae4e6cc0ff560da25497677e34fefd2338cc467a8972f602b62b15"},
@@ -582,10 +580,10 @@
 {"name":"seed-fu","version":"2.3.7","platform":"ruby","checksum":"f19673443e9af799b730e3d4eca6a89b39e5a36825015dffd00d02ea3365cf74"},
 {"name":"selenium-webdriver","version":"4.15.0","platform":"ruby","checksum":"36134e883c4df98f1b7e8519a3753c77427b74621147f8245aa6cac306d52297"},
 {"name":"semver_dialects","version":"1.5.0","platform":"ruby","checksum":"0080f1abafc9c1af82d34e890d7c317b9eacb56b9e03040107ef5d1a51ca49ae"},
-{"name":"sentry-rails","version":"5.8.0","platform":"ruby","checksum":"c11b2d909de2c2bfda793c45f64180fd784d54c46886338b683ee3f8efa7731b"},
+{"name":"sentry-rails","version":"5.10.0","platform":"ruby","checksum":"99aa2fac136c26942eb1897c65de65dac88ad43ac5eb183ff20711287a137ebd"},
 {"name":"sentry-raven","version":"3.1.2","platform":"ruby","checksum":"103d3b122958810d34898ce2e705bcf549ddb9d855a70ce9a3970ee2484f364a"},
-{"name":"sentry-ruby","version":"5.8.0","platform":"ruby","checksum":"caeb121433be379fb94e991a45265a287b13a9a9083e7264f539752369d37110"},
-{"name":"sentry-sidekiq","version":"5.8.0","platform":"ruby","checksum":"90d1123d16a9fc5fd99dbad190b766dd189eaf9e2baddad641f1334e1877c779"},
+{"name":"sentry-ruby","version":"5.10.0","platform":"ruby","checksum":"115c24c0aee1309210f3a2988fb118e2bec1f11609feeda90e694388b1183619"},
+{"name":"sentry-sidekiq","version":"5.10.0","platform":"ruby","checksum":"cc81018d0733fb1be3fb5641c9e0b61030bbeaa1d0b23ca64797d70def7aea1a"},
 {"name":"set","version":"1.0.2","platform":"ruby","checksum":"02ffa4de1f2621495e05b72326040dd014d7abbcb02fea698bc600a389992c02"},
 {"name":"sexp_processor","version":"4.17.0","platform":"ruby","checksum":"4daa4874ce1838cd801c65e66ed5d4f140024404a3de7482c36d4ef2604dff6f"},
 {"name":"shellany","version":"0.0.1","platform":"ruby","checksum":"0e127a9132698766d7e752e82cdac8250b6adbd09e6c0a7fbbb6f61964fedee7"},

Gemfile.lock

@@ -291,7 +291,7 @@ GEM
     aws-sdk-cloudformation (1.41.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.187.1)
+    aws-sdk-core (3.188.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
@@ -299,8 +299,8 @@ GEM
     aws-sdk-kms (1.64.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.137.0)
-      aws-sdk-core (~> 3, >= 3.181.0)
+    aws-sdk-s3 (1.139.0)
+      aws-sdk-core (~> 3, >= 3.188.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.6)
     aws-sigv4 (1.6.0)
@@ -1014,7 +1014,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.21.4)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     lookbook (2.0.1)
@@ -1095,7 +1095,7 @@ GEM
     netrc (0.11.0)
     nio4r (2.5.8)
     no_proxy_fix (0.1.2)
-    nokogiri (1.15.4)
+    nokogiri (1.15.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     notiffany (0.1.3)
@@ -1334,7 +1334,7 @@ GEM
       optimist (>= 3.0.0)
     rbtree (0.4.6)
     rchardet (1.8.0)
-    re2 (2.3.0)
+    re2 (2.4.3)
       mini_portile2 (~> 2.8.5)
     recaptcha (5.12.3)
       json
@@ -1405,7 +1405,7 @@ GEM
     rspec-parameterized-table_syntax (1.0.0)
       binding_of_caller
       rspec-parameterized-core (< 2)
-    rspec-rails (6.0.3)
+    rspec-rails (6.1.0)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
@@ -1512,15 +1512,15 @@ GEM
       pastel (~> 0.8.0)
       thor (~> 1.3)
       tty-command (~> 0.10.1)
-    sentry-rails (5.8.0)
+    sentry-rails (5.10.0)
       railties (>= 5.0)
-      sentry-ruby (~> 5.8.0)
+      sentry-ruby (~> 5.10.0)
     sentry-raven (3.1.2)
       faraday (>= 1.0)
-    sentry-ruby (5.8.0)
+    sentry-ruby (5.10.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-    sentry-sidekiq (5.8.0)
-      sentry-ruby (~> 5.8.0)
+    sentry-sidekiq (5.10.0)
+      sentry-ruby (~> 5.10.0)
       sidekiq (>= 3.0)
     set (1.0.2)
     sexp_processor (4.17.0)
@@ -1792,8 +1792,8 @@ DEPENDENCIES
   autoprefixer-rails (= 10.2.5.1)
   awesome_print
   aws-sdk-cloudformation (~> 1)
-  aws-sdk-core (~> 3.187.1)
-  aws-sdk-s3 (~> 1.137.0)
+  aws-sdk-core (~> 3.188.0)
+  aws-sdk-s3 (~> 1.139.0)
   axe-core-rspec
   babosa (~> 2.0)
   base32 (~> 0.3.0)
@@ -1944,7 +1944,7 @@ DEPENDENCIES
   listen (~> 3.7)
   lockbox (~> 1.3.0)
   lograge (~> 0.5)
-  loofah (~> 2.21.4)
+  loofah (~> 2.22.0)
   lookbook (~> 2.0, >= 2.0.1)
   lru_redux
   mail (= 2.8.1)
@@ -1960,7 +1960,7 @@ DEPENDENCIES
   net-ldap (~> 0.17.1)
   net-ntp
   net-protocol (~> 0.1.3)
-  nokogiri (~> 1.15, >= 1.15.4)
+  nokogiri (~> 1.15, >= 1.15.5)
   oauth2 (~> 2.0)
   octokit (~> 6.0)
   ohai (~> 18.1)
@@ -2012,7 +2012,7 @@ DEPENDENCIES
   rails-i18n (~> 7.0)
   rainbow (~> 3.0)
   rbtrace (~> 0.4)
-  re2 (= 2.3.0)
+  re2 (= 2.4.3)
   recaptcha (~> 5.12)
   redis (~> 4.8.0)
   redis-actionpack (~> 5.3.0)
@@ -2024,7 +2024,7 @@ DEPENDENCIES
   rqrcode (~> 2.0)
   rspec-benchmark (~> 0.6.0)
   rspec-parameterized (~> 1.0)
-  rspec-rails (~> 6.0.3)
+  rspec-rails (~> 6.1.0)
   rspec-retry (~> 0.6.2)
   rspec_flaky!
   rspec_junit_formatter
@@ -2046,10 +2046,10 @@ DEPENDENCIES
   seed-fu (~> 2.3.7)
   selenium-webdriver (~> 4.15)
   semver_dialects (~> 1.5)
-  sentry-rails (~> 5.8.0)
+  sentry-rails (~> 5.10.0)
   sentry-raven (~> 3.1)
-  sentry-ruby (~> 5.8.0)
-  sentry-sidekiq (~> 5.8.0)
+  sentry-ruby (~> 5.10.0)
+  sentry-sidekiq (~> 5.10.0)
   shoulda-matchers (~> 5.1.0)
   sidekiq (~> 6.5.10)
   sidekiq-cron (~> 1.8.0)

app/assets/javascripts/ci/catalog/components/details/ci_resource_header.vue

 <script>
 import { GlAvatar, GlAvatarLink, GlBadge } from '@gitlab/ui';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
+import { cleanLeadingSeparator } from '~/lib/utils/url_utility';
 import CiIcon from '~/vue_shared/components/ci_icon.vue';
 import CiResourceAbout from './ci_resource_about.vue';
 import CiResourceHeaderSkeletonLoader from './ci_resource_header_skeleton_loader.vue';
@@ -47,9 +48,6 @@ export default {
     entityId() {
       return getIdFromGraphQLId(this.resource.id);
     },
-    fullPath() {
-      return `${this.rootNamespace.fullPath}/${this.rootNamespace.name}`;
-    },
     hasLatestVersion() {
       return this.latestVersion?.tagName;
     },
@@ -59,12 +57,12 @@ export default {
     latestVersion() {
       return this.resource.latestVersion;
     },
-    rootNamespace() {
-      return this.resource.rootNamespace;
-    },
     versionBadgeText() {
       return this.latestVersion.tagName;
     },
+    webPath() {
+      return cleanLeadingSeparator(this.resource?.webPath);
+    },
   },
 };
 </script>
@@ -86,7 +84,7 @@ export default {
         class="gl-display-flex gl-flex-direction-column gl-align-items-flex-start gl-justify-content-center"
       >
         <div class="gl-font-sm gl-text-secondary">
-          {{ fullPath }}
+          {{ webPath }}
         </div>
         <span class="gl-display-flex">
           <div class="gl-font-lg gl-font-weight-bold">{{ resource.name }}</div>

app/assets/javascripts/ci/catalog/components/list/catalog_list_skeleton_loader.vue

@@ -37,21 +37,19 @@ export default {
     >
       <!-- Catalog project avatar -->
       <rect x="0" y="0" width="48" height="48" rx="4" ry="4" />
-      <!-- namespace path -->
-      <rect x="60" y="4" width="400" height="16" rx="2" ry="2" />
+      <!-- resource path -->
+      <rect x="60" y="0" width="200" height="10" rx="2" ry="2" />
+      <!-- resource name -->
+      <rect x="60" y="14" width="400" height="16" rx="2" ry="2" />
       <!-- Project description -->
-      <rect x="60" y="30" width="500" height="12" rx="2" ry="2" />
+      <rect x="60" y="34" width="500" height="12" rx="2" ry="2" />
 
       <!-- Release date line -->
       <rect :x="coordinates.releaseDateX" y="30" width="200" height="12" rx="2" ry="2" />
 
       <!-- Favorites -->
-      <rect :x="coordinates.statsX" y="4" width="16" height="16" rx="2" ry="2" />
-      <rect :x="coordinates.statsX + 18" y="7" width="18" height="10" rx="2" ry="2" />
-
-      <!-- Forks -->
       <rect :x="coordinates.statsX + 50" y="4" width="16" height="16" rx="2" ry="2" />
-      <rect :x="coordinates.statsX + 68" y="7" width="18" height="10" rx="2" ry="2" />
+      <rect :x="coordinates.statsX + 70" y="7" width="18" height="10" rx="2" ry="2" />
     </gl-skeleton-loader>
   </div>
 </template>

app/assets/javascripts/ci/catalog/components/list/ci_resources_list_item.vue

@@ -3,6 +3,7 @@ import { GlAvatar, GlBadge, GlIcon, GlLink, GlSprintf, GlTooltipDirective } from
 import { s__ } from '~/locale';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import { formatDate, getTimeago } from '~/lib/utils/datetime_utility';
+import { cleanLeadingSeparator } from '~/lib/utils/url_utility';
 import { CI_RESOURCE_DETAILS_PAGE_NAME } from '../../router/constants';
 
 export default {
@@ -45,6 +46,9 @@ export default {
     starCount() {
       return this.resource?.starCount || 0;
     },
+    starIcon() {
+      return this.starCount > 0 ? 'star' : 'star-o';
+    },
     hasReleasedVersion() {
       return Boolean(this.latestVersion?.releasedAt);
     },
@@ -57,12 +61,12 @@ export default {
     releasedAt() {
       return getTimeago().format(this.latestVersion?.releasedAt);
     },
-    resourcePath() {
-      return `${this.resource.rootNamespace?.name} / ${this.resource.rootNamespace?.fullPath} / `;
-    },
     tagName() {
       return this.latestVersion?.tagName || this.$options.i18n.unreleased;
     },
+    webPath() {
+      return cleanLeadingSeparator(this.resource?.webPath);
+    },
   },
   methods: {
     navigateToDetailsPage(e) {
@@ -98,20 +102,21 @@ export default {
       @click="navigateToDetailsPage"
     />
     <div class="gl-display-flex gl-flex-direction-column gl-flex-grow-1">
-      <div class="gl-display-flex gl-flex-wrap gl-gap-2 gl-mb-2">
+      <span class="gl-font-sm gl-mb-1">{{ webPath }}</span>
+      <div class="gl-display-flex gl-flex-wrap gl-gap-2 gl-mb-1">
         <gl-link
           class="gl-text-gray-900! gl-mr-1"
           :href="detailsPageHref"
           data-testid="ci-resource-link"
           @click="navigateToDetailsPage"
         >
-          {{ resourcePath }} <b> {{ resource.name }}</b>
+          <b> {{ resource.name }}</b>
         </gl-link>
         <div class="gl-display-flex gl-flex-grow-1 gl-md-justify-content-space-between">
-          <gl-badge size="sm">{{ tagName }}</gl-badge>
+          <gl-badge size="sm" class="gl-h-5 gl-align-self-center">{{ tagName }}</gl-badge>
           <span class="gl-display-flex gl-align-items-center gl-ml-5">
             <span class="gl--flex-center" data-testid="stats-favorites">
-              <gl-icon name="star" :size="14" class="gl-mr-1" />
+              <gl-icon :name="starIcon" :size="14" class="gl-mr-2" />
               <span class="gl-mr-3">{{ starCount }}</span>
             </span>
           </span>

app/assets/javascripts/ci/catalog/graphql/fragments/catalog_resource.fragment.graphql

@@ -15,10 +15,5 @@ fragment CatalogResourceFields on CiCatalogResource {
       webUrl
     }
   }
-  rootNamespace {
-    id
-    fullPath
-    name
-  }
   webPath
 }

app/assets/javascripts/ci/job_details/components/sidebar/sidebar_job_details_container.vue

@@ -4,6 +4,7 @@ import { mapState } from 'vuex';
 import { GlBadge } from '@gitlab/ui';
 import { helpPagePath } from '~/helpers/help_page_helper';
 import { timeIntervalInWords } from '~/lib/utils/datetime_utility';
+import { mergeUrlParams } from '~/lib/utils/url_utility';
 import { __, sprintf } from '~/locale';
 import timeagoMixin from '~/vue_shared/mixins/timeago';
 import DetailRow from './sidebar_detail_row.vue';
@@ -15,8 +16,9 @@ export default {
     GlBadge,
   },
   mixins: [timeagoMixin],
+  inject: ['pipelineTestReportUrl'],
   computed: {
-    ...mapState(['job']),
+    ...mapState(['job', 'testSummary']),
     coverage() {
       return `${this.job.coverage}%`;
     },
@@ -74,6 +76,32 @@ export default {
     runnerAdminPath() {
       return this.job?.runner?.admin_path || '';
     },
+    hasTestSummaryDetails() {
+      return Object.keys(this.testSummary).length > 0;
+    },
+    testSummaryDescription() {
+      let message;
+
+      if (this.testSummary?.total?.failed > 0) {
+        message = sprintf(__('%{failures} of %{total} failed'), {
+          failures: this.testSummary?.total?.failed,
+          total: this.testSummary?.total.count,
+        });
+      } else {
+        message = sprintf(__('%{total}'), {
+          total: this.testSummary?.total.count,
+        });
+      }
+
+      return message;
+    },
+    testReportUrlWithJobName() {
+      const urlParams = {
+        job_name: this.job.name,
+      };
+
+      return mergeUrlParams(urlParams, this.pipelineTestReportUrl);
+    },
   },
   i18n: {
     COVERAGE: __('Coverage'),
@@ -82,6 +110,7 @@ export default {
     QUEUED: __('Queued'),
     RUNNER: __('Runner'),
     TAGS: __('Tags'),
+    TEST_SUMMARY: __('Test summary'),
     TIMEOUT: __('Timeout'),
   },
   TIMEOUT_HELP_URL: helpPagePath('/ci/pipelines/settings.md', {
@@ -115,6 +144,13 @@ export default {
       :path="runnerAdminPath"
     />
     <detail-row v-if="job.coverage" :value="coverage" :title="$options.i18n.COVERAGE" />
+    <detail-row
+      v-if="hasTestSummaryDetails"
+      :value="testSummaryDescription"
+      :title="$options.i18n.TEST_SUMMARY"
+      :path="testReportUrlWithJobName"
+      data-testid="test-summary"
+    />
 
     <p v-if="hasTags" class="build-detail-row" data-testid="job-tags">
       <span class="font-weight-bold">{{ $options.i18n.TAGS }}:</span>

app/assets/javascripts/ci/job_details/index.js

@@ -30,11 +30,13 @@ export const initJobDetails = () => {
     projectPath,
     retryOutdatedJobDocsUrl,
     aiRootCauseAnalysisAvailable,
+    testReportSummaryUrl,
+    pipelineTestReportUrl,
   } = el.dataset;
 
   // init store to start fetching log
   const store = createStore();
-  store.dispatch('init', { endpoint, pagePath });
+  store.dispatch('init', { endpoint, pagePath, testReportSummaryUrl });
 
   return new Vue({
     el,
@@ -44,6 +46,7 @@ export const initJobDetails = () => {
       projectPath,
       retryOutdatedJobDocsUrl,
       aiRootCauseAnalysisAvailable: parseBoolean(aiRootCauseAnalysisAvailable),
+      pipelineTestReportUrl,
     },
     render(h) {
       return h(JobApp, {

app/assets/javascripts/ci/job_details/store/actions.js

@@ -15,10 +15,11 @@ import { __ } from '~/locale';
 import { reportToSentry } from '~/ci/utils';
 import * as types from './mutation_types';
 
-export const init = ({ dispatch }, { endpoint, pagePath }) => {
+export const init = ({ dispatch }, { endpoint, pagePath, testReportSummaryUrl }) => {
   dispatch('setJobLogOptions', {
     endpoint,
     pagePath,
+    testReportSummaryUrl,
   });
 
   return dispatch('fetchJob');
@@ -170,6 +171,7 @@ export const fetchJobLog = ({ dispatch, state }) =>
 
       if (data.complete) {
         dispatch('stopPollingJobLog');
+        dispatch('requestTestSummary');
       } else if (!state.jobLogTimeout) {
         dispatch('startPollingJobLog');
       }
@@ -273,3 +275,23 @@ export const triggerManualJob = ({ state }, variables) => {
       }),
     );
 };
+
+export const requestTestSummary = ({ state, commit, dispatch }) => {
+  if (!state.testSummaryComplete) {
+    axios
+      .get(state.testReportSummaryUrl)
+      .then(({ data }) => {
+        dispatch('receiveTestSummarySuccess', data);
+      })
+      .catch((e) => {
+        reportToSentry('job_test_summary_report', e);
+      })
+      .finally(() => {
+        commit(types.RECEIVE_TEST_SUMMARY_COMPLETE);
+      });
+  }
+};
+
+export const receiveTestSummarySuccess = ({ commit }, data) => {
+  commit(types.RECEIVE_TEST_SUMMARY_SUCCESS, data);
+};

app/assets/javascripts/ci/job_details/store/mutation_types.js

@@ -28,3 +28,6 @@ export const SET_SELECTED_STAGE = 'SET_SELECTED_STAGE';
 export const REQUEST_JOBS_FOR_STAGE = 'REQUEST_JOBS_FOR_STAGE';
 export const RECEIVE_JOBS_FOR_STAGE_SUCCESS = 'RECEIVE_JOBS_FOR_STAGE_SUCCESS';
 export const RECEIVE_JOBS_FOR_STAGE_ERROR = 'RECEIVE_JOBS_FOR_STAGE_ERROR';
+
+export const RECEIVE_TEST_SUMMARY_SUCCESS = 'RECEIVE_TEST_SUMMARY_SUCCESS';
+export const RECEIVE_TEST_SUMMARY_COMPLETE = 'RECEIVE_TEST_SUMMARY_COMPLETE';

app/assets/javascripts/ci/job_details/store/mutations.js

@@ -6,6 +6,7 @@ export default {
   [types.SET_JOB_LOG_OPTIONS](state, options = {}) {
     state.jobLogEndpoint = options.pagePath;
     state.jobEndpoint = options.endpoint;
+    state.testReportSummaryUrl = options.testReportSummaryUrl;
   },
 
   [types.HIDE_SIDEBAR](state) {
@@ -127,4 +128,10 @@ export default {
     state.isLoadingJobs = false;
     state.jobs = [];
   },
+  [types.RECEIVE_TEST_SUMMARY_SUCCESS](state, testSummary) {
+    state.testSummary = testSummary;
+  },
+  [types.RECEIVE_TEST_SUMMARY_COMPLETE](state) {
+    state.testSummaryComplete = true;
+  },
 };