Compare revisions

3679ee81 · 3679ee81 · 3679ee81 · 3679ee81 · 3679ee81 · 3679ee81
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
-b670554eae8643f2072d3b4f6f7c5cd2b9ec8776
+54b1444e48b2232f59f26c5a15c704e312147723
--- a/GITLAB_KAS_VERSION
+++ b/GITLAB_KAS_VERSION
-0.0.5
+0.0.6
--- a/GITLAB_PAGES_VERSION
+++ b/GITLAB_PAGES_VERSION
-1.25.0
+1.28.0
--- a/GITLAB_SHELL_VERSION
+++ b/GITLAB_SHELL_VERSION
-13.7.0
+13.11.0
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
-8.46.0
+8.52.0
--- a/Gemfile
+++ b/Gemfile
@@ -19,13 +19,15 @@ gem 'default_value_for', '~> 3.3.0'
 gem 'pg', '~> 1.1'

 gem 'rugged', '~> 0.28'
-gem 'grape-path-helpers', '~> 1.3'
+gem 'grape-path-helpers', '~> 1.4'

 gem 'faraday', '~> 1.0'
 gem 'marginalia', '~> 1.9.0'

 # Authentication libraries
-gem 'devise', '~> 4.6'
+gem 'devise', '~> 4.7.2'
+# TODO: verify ARM compile issue on 3.1.13+ version (see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18828)
+gem 'bcrypt', '3.1.12'
 gem 'doorkeeper', '~> 5.3.0'
 gem 'doorkeeper-openid_connect', '~> 1.7.4'
 gem 'omniauth', '~> 1.8'
@@ -89,14 +91,16 @@ gem 'grape-entity', '~> 0.7.1'
 gem 'rack-cors', '~> 1.0.6', require: 'rack/cors'

 # GraphQL API
-gem 'graphql', '~> 1.10.5'
+gem 'graphql', '~> 1.11.4'
 # NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab/issues/31771
 # TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released:
 # https://gitlab.com/gitlab-org/gitlab/issues/31747
 gem 'graphiql-rails', '~> 1.4.10'
 gem 'apollo_upload_server', '~> 2.0.2'
 gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
+gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)

+gem 'hashie'
 # Disable strong_params so that Mash does not respond to :permitted?
 gem 'hashie-forbidden_attributes'

@@ -108,7 +112,7 @@ gem 'hamlit', '~> 2.11.0'

 # Files attachments
 gem 'carrierwave', '~> 1.3'
-gem 'mini_magick'
+gem 'mini_magick', '~> 4.10.1'

 # for backups
 gem 'fog-aws', '~> 3.5'
@@ -120,7 +124,7 @@ gem 'fog-local', '~> 0.6'
 gem 'fog-openstack', '~> 1.0'
 gem 'fog-rackspace', '~> 0.1.1'
 gem 'fog-aliyun', '~> 0.3'
-gem 'gitlab-fog-azure-rm', '~> 0.9', require: false
+gem 'gitlab-fog-azure-rm', '~> 1.0', require: false

 # for Google storage
 gem 'google-api-client', '~> 0.33'
@@ -155,7 +159,7 @@ gem 'wikicloth', '0.8.1'
 gem 'asciidoctor', '~> 2.0.10'
 gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
 gem 'asciidoctor-plantuml', '~> 0.0.12'
-gem 'rouge', '~> 3.21.0'
+gem 'rouge', '~> 3.24.0'
 gem 'truncato', '~> 0.7.11'
 gem 'bootstrap_form', '~> 4.2.0'
 gem 'nokogiri', '~> 1.10.9'
@@ -169,7 +173,7 @@ gem 'diffy', '~> 3.3'
 gem 'diff_match_patch', '~> 0.1.0'

 # Application server
-gem 'rack', '~> 2.0.9'
+gem 'rack', '~> 2.1.4'
 # https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually
 gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base'

@@ -244,7 +248,7 @@ gem 'atlassian-jwt', '~> 0.2.0'
 gem 'flowdock', '~> 0.7'

 # Slack integration
-gem 'slack-messenger', '~> 2.3.3'
+gem 'slack-messenger', '~> 2.3.4'

 # Hangouts Chat integration
 gem 'hangouts-chat', '~> 0.0.5'
@@ -256,7 +260,7 @@ gem 'asana', '0.10.2'
 gem 'ruby-fogbugz', '~> 0.2.1'

 # Kubernetes integration
-gem 'kubeclient', '~> 4.6.0'
+gem 'kubeclient', '~> 4.9.1'

 # Sanitize user input
 gem 'sanitize', '~> 5.2.1'
@@ -272,7 +276,7 @@ gem 'licensee', '~> 8.9'
 gem 'ace-rails-ap', '~> 4.1.0'

 # Detect and convert string character encoding
-gem 'charlock_holmes', '~> 0.7.5'
+gem 'charlock_holmes', '~> 0.7.7'

 # Detect mime content type from content
 gem 'mimemagic', '~> 0.3.2'
@@ -284,11 +288,10 @@ gem 'fast_blank'
 gem 'gitlab-chronic', '~> 0.10.5'
 gem 'gitlab_chronic_duration', '~> 0.10.6.2'

-gem 'webpack-rails', '~> 0.9.10'
 gem 'rack-proxy', '~> 0.6.0'

 gem 'sassc-rails', '~> 2.1.0'
-gem 'uglifier', '~> 2.7.2'
+gem 'terser', '1.0.2'

 gem 'addressable', '~> 2.7'
 gem 'font-awesome-rails', '~> 4.7'
@@ -305,10 +308,13 @@ gem 'rack-attack', '~> 6.3.0'
 # Sentry integration
 gem 'sentry-raven', '~> 3.0'

+# PostgreSQL query parsing
+gem 'gitlab-pg_query', '~> 1.3', require: 'pg_query'
+
 gem 'premailer-rails', '~> 1.10.3'

 # LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '0.12.1'
+gem 'gitlab-labkit', '0.13.1'

 # I18n
 gem 'ruby_parser', '~> 3.8', require: false
@@ -330,13 +336,13 @@ group :metrics do
  gem 'method_source', '~> 1.0', require: false

  # Prometheus
-  gem 'prometheus-client-mmap', '~> 0.11.0'
+  gem 'prometheus-client-mmap', '~> 0.12.0'
  gem 'raindrops', '~> 0.18'
 end

 group :development do
  gem 'brakeman', '~> 4.2', require: false
-  gem 'danger', '~> 8.0', require: false
+  gem 'danger', '~> 8.0.6', require: false

  gem 'letter_opener_web', '~> 1.3.4'

@@ -375,8 +381,6 @@ group :development, :test do

  gem 'scss_lint', '~> 0.56.0', require: false
  gem 'haml_lint', '~> 0.34.0', require: false
-  gem 'simplecov', '~> 0.18.5', require: false
-  gem 'simplecov-cobertura', '~> 1.3.1', require: false
  gem 'bundler-audit', '~> 0.6.1', require: false

  gem 'benchmark-ips', '~> 2.3.0', require: false
@@ -394,15 +398,20 @@ group :development, :test do
  gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
 end

+group :development, :test, :coverage do
+  gem 'simplecov', '~> 0.18.5', require: false
+  gem 'simplecov-cobertura', '~> 1.3.1', require: false
+end
+
 # Gems required in omnibus-gitlab pipeline
 group :development, :test, :omnibus do
-  gem 'license_finder', '~> 5.4', require: false
+  gem 'license_finder', '~> 6.0', require: false
 end

 group :test do
  gem 'fuubar', '~> 2.2.0'
  gem 'rspec-retry', '~> 0.6.1'
-  gem 'rspec_profiling', '~> 0.0.5'
+  gem 'rspec_profiling', '~> 0.0.6'
  gem 'rspec-parameterized', require: false

  gem 'capybara', '~> 3.33.0'
@@ -411,7 +420,7 @@ group :test do

  gem 'shoulda-matchers', '~> 4.0.1', require: false
  gem 'email_spec', '~> 2.2.0'
-  gem 'webmock', '~> 3.5.1'
+  gem 'webmock', '~> 3.9.1'
  gem 'rails-controller-testing'
  gem 'concurrent-ruby', '~> 1.1'
  gem 'test-prof', '~> 0.12.0'
@@ -425,7 +434,7 @@ end
 gem 'octokit', '~> 4.15'

 # https://gitlab.com/gitlab-org/gitlab/issues/207207
-gem 'gitlab-mail_room', '~> 0.0.6', require: 'mail_room'
+gem 'gitlab-mail_room', '~> 0.0.7', require: 'mail_room'

 gem 'email_reply_trimmer', '~> 0.1'
 gem 'html2text'
@@ -461,7 +470,7 @@ group :ed25519 do
 end

 # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 13.3.0-rc1'
+gem 'gitaly', '~> 13.5.0-rc2'

 gem 'grpc', '~> 1.30.2'

@@ -512,3 +521,6 @@ gem 'multi_json', '~> 1.14.1'
 gem 'yajl-ruby', '~> 1.4.1', require: 'yajl'

 gem 'webauthn', '~> 2.3'
+
+# IPAddress utilities
+gem 'ipaddress', '~> 0.8.3'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,59 +6,59 @@ GEM
    ace-rails-ap (4.1.2)
    acme-client (2.0.6)
      faraday (>= 0.17, < 2.0.0)
-    actioncable (6.0.3.1)
-      actionpack (= 6.0.3.1)
+    actioncable (6.0.3.3)
+      actionpack (= 6.0.3.3)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.1)
-      actionpack (= 6.0.3.1)
-      activejob (= 6.0.3.1)
-      activerecord (= 6.0.3.1)
-      activestorage (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
+    actionmailbox (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      activejob (= 6.0.3.3)
+      activerecord (= 6.0.3.3)
+      activestorage (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
      mail (>= 2.7.1)
-    actionmailer (6.0.3.1)
-      actionpack (= 6.0.3.1)
-      actionview (= 6.0.3.1)
-      activejob (= 6.0.3.1)
+    actionmailer (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      actionview (= 6.0.3.3)
+      activejob (= 6.0.3.3)
      mail (~> 2.5, >= 2.5.4)
      rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.1)
-      actionview (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
+    actionpack (6.0.3.3)
+      actionview (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
      rack (~> 2.0, >= 2.0.8)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.3.1)
-      actionpack (= 6.0.3.1)
-      activerecord (= 6.0.3.1)
-      activestorage (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
+    actiontext (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      activerecord (= 6.0.3.3)
+      activestorage (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
      nokogiri (>= 1.8.5)
-    actionview (6.0.3.1)
-      activesupport (= 6.0.3.1)
+    actionview (6.0.3.3)
+      activesupport (= 6.0.3.3)
      builder (~> 3.1)
      erubi (~> 1.4)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3.1)
-      activesupport (= 6.0.3.1)
+    activejob (6.0.3.3)
+      activesupport (= 6.0.3.3)
      globalid (>= 0.3.6)
-    activemodel (6.0.3.1)
-      activesupport (= 6.0.3.1)
-    activerecord (6.0.3.1)
-      activemodel (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
+    activemodel (6.0.3.3)
+      activesupport (= 6.0.3.3)
+    activerecord (6.0.3.3)
+      activemodel (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
    activerecord-explain-analyze (0.1.0)
      activerecord (>= 4)
      pg
-    activestorage (6.0.3.1)
-      actionpack (= 6.0.3.1)
-      activejob (= 6.0.3.1)
-      activerecord (= 6.0.3.1)
+    activestorage (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      activejob (= 6.0.3.3)
+      activerecord (= 6.0.3.3)
      marcel (~> 0.3.1)
-    activesupport (6.0.3.1)
+    activesupport (6.0.3.3)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 0.7, < 2)
      minitest (~> 5.1)
@@ -87,7 +87,7 @@ GEM
      asciidoctor (>= 1.5.6, < 3.0.0)
    asciidoctor-plantuml (0.0.12)
      asciidoctor (>= 1.5.6, < 3.0.0)
-    ast (2.4.0)
+    ast (2.4.1)
    atlassian-jwt (0.2.0)
      jwt (~> 2.1.0)
    attr_encrypted (3.1.0)
@@ -167,7 +167,7 @@ GEM
      mime-types (>= 1.16)
    cbor (0.5.9.6)
    character_set (1.4.0)
-    charlock_holmes (0.7.6)
+    charlock_holmes (0.7.7)
    childprocess (3.0.0)
    chunky_png (1.3.5)
    citrus (3.0.2)
@@ -183,7 +183,7 @@ GEM
    concord (0.1.5)
      adamantium (~> 0.2.0)
      equalizer (~> 0.0.9)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
    connection_pool (2.2.2)
    contracts (0.11.0)
    cork (0.3.0)
@@ -202,7 +202,7 @@ GEM
    css_parser (1.7.0)
      addressable
    daemons (1.2.6)
-    danger (8.0.5)
+    danger (8.0.6)
      claide (~> 1.0)
      claide-plugins (>= 0.9.2)
      colored2 (~> 3.1)
@@ -235,7 +235,7 @@ GEM
      thor (>= 0.19, < 2)
      unicode_plot (>= 0.0.4, < 1.0.0)
    device_detector (1.0.0)
-    devise (4.7.1)
+    devise (4.7.3)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
      railties (>= 4.1.0)
@@ -253,7 +253,7 @@ GEM
    discordrb-webhooks-blackst0ne (3.3.0)
      rest-client (~> 2.0)
    docile (1.3.2)
-    domain_name (0.5.20180417)
+    domain_name (0.5.20190701)
      unf (>= 0.0.5, < 1.0.0)
    doorkeeper (5.3.3)
      railties (>= 5)
@@ -312,7 +312,7 @@ GEM
      tzinfo
    eventmachine (1.2.7)
    excon (0.71.1)
-    execjs (2.6.0)
+    execjs (2.7.0)
    expression_parser (0.9.0)
    extended-markdown-filter (0.6.0)
      html-pipeline (~> 2.0)
@@ -416,29 +416,30 @@ GEM
      rails (>= 3.2.0)
    git (1.7.0)
      rchardet (~> 1.8)
-    gitaly (13.3.0.pre.rc2)
+    gitaly (13.5.0.pre.rc2)
      grpc (~> 1.0)
    github-markup (1.7.0)
    gitlab-chronic (0.10.5)
      numerizer (~> 0.2)
-    gitlab-fog-azure-rm (0.9.0)
+    gitlab-fog-azure-rm (1.0.0)
      azure-storage-blob (~> 2.0)
      azure-storage-common (~> 2.0)
      fog-core (= 2.1.0)
      fog-json (~> 1.2.0)
      mime-types
      ms_rest_azure (~> 0.12.0)
-    gitlab-labkit (0.12.1)
+    gitlab-labkit (0.13.1)
      actionpack (>= 5.0.0, < 6.1.0)
      activesupport (>= 5.0.0, < 6.1.0)
      grpc (~> 1.19)
-      jaeger-client (~> 0.10)
+      jaeger-client (~> 1.1)
      opentracing (~> 0.4)
      redis (> 3.0.0, < 5.0.0)
    gitlab-license (1.0.0)
-    gitlab-mail_room (0.0.6)
+    gitlab-mail_room (0.0.7)
    gitlab-markup (1.7.1)
    gitlab-net-dns (0.9.1)
+    gitlab-pg_query (1.3.0)
    gitlab-puma (4.3.5.gitlab.3)
      nio4r (~> 2.0)
    gitlab-puma_worker_killer (0.1.1.gitlab.1)
@@ -495,7 +496,7 @@ GEM
    grape-entity (0.7.1)
      activesupport (>= 4.0)
      multi_json (>= 1.3.2)
-    grape-path-helpers (1.3.0)
+    grape-path-helpers (1.4.0)
      activesupport
      grape (~> 1.3)
      rake (~> 12)
@@ -505,7 +506,14 @@ GEM
    graphiql-rails (1.4.10)
      railties
      sprockets-rails
-    graphql (1.10.5)
+    graphlient (0.4.0)
+      faraday (>= 1.0)
+      faraday_middleware
+      graphql-client
+    graphql (1.11.4)
+    graphql-client (0.16.0)
+      activesupport (>= 3.0)
+      graphql (~> 1.8)
    graphql-docs (1.6.0)
      commonmarker (~> 0.16)
      escape_utils (~> 1.2)
@@ -547,7 +555,7 @@ GEM
      tilt
    hana (1.3.6)
    hangouts-chat (0.0.5)
-    hashdiff (0.3.8)
+    hashdiff (1.0.1)
    hashie (3.6.0)
    hashie-forbidden_attributes (0.1.1)
      hashie (>= 3.0)
@@ -563,21 +571,22 @@ GEM
    html2text (0.2.0)
      nokogiri (~> 1.6)
    htmlentities (4.3.4)
-    http (4.2.0)
+    http (4.4.1)
      addressable (~> 2.3)
      http-cookie (~> 1.0)
-      http-form_data (~> 2.0)
+      http-form_data (~> 2.2)
      http-parser (~> 1.2.0)
+    http-accept (1.7.0)
    http-cookie (1.0.3)
      domain_name (~> 0.5)
-    http-form_data (2.1.1)
+    http-form_data (2.3.0)
    http-parser (1.2.1)
      ffi-compiler (>= 1.0, < 2.0)
    httparty (0.16.4)
      mime-types (~> 3.0)
      multi_xml (>= 0.5.2)
    httpclient (2.8.3)
-    i18n (1.8.3)
+    i18n (1.8.5)
      concurrent-ruby (~> 1.0)
    i18n_data (0.8.0)
    icalendar (2.4.1)
@@ -585,7 +594,7 @@ GEM
    invisible_captcha (0.12.1)
      rails (>= 3.2.0)
    ipaddress (0.8.3)
-    jaeger-client (0.10.0)
+    jaeger-client (1.1.0)
      opentracing (~> 0.3)
      thrift
    jaro_winkler (1.5.4)
@@ -611,6 +620,9 @@ GEM
      hana (~> 1.3)
      regexp_parser (~> 1.5)
      uri_template (~> 0.7)
+    jsonpath (1.0.5)
+      multi_json
+      to_regexp (~> 0.2.1)
    jwt (2.1.0)
    kaminari (1.2.1)
      activesupport (>= 4.1.0)
@@ -631,9 +643,10 @@ GEM
      rexml
    kramdown-parser-gfm (1.1.0)
      kramdown (~> 2.0)
-    kubeclient (4.6.0)
+    kubeclient (4.9.1)
      http (>= 3.0, < 5.0)
-      recursive-open-struct (~> 1.0, >= 1.0.4)
+      jsonpath (~> 1.0)
+      recursive-open-struct (~> 1.1, >= 1.1.1)
      rest-client (~> 2.0)
    launchy (2.4.3)
      addressable (~> 2.3)
@@ -643,9 +656,9 @@ GEM
      actionmailer (>= 3.2)
      letter_opener (~> 1.0)
      railties (>= 3.2)
-    license_finder (5.4.0)
+    license_finder (6.0.0)
      bundler
-      rubyzip
+      rubyzip (>= 1, < 3)
      thor
      toml (= 0.2.0)
      with_env (= 1.1.0)
@@ -662,7 +675,7 @@ GEM
      activesupport (>= 4)
      railties (>= 4)
      request_store (~> 1.0)
-    loofah (2.5.0)
+    loofah (2.7.0)
      crass (~> 1.0.2)
      nokogiri (>= 1.5.9)
    lru_redux (1.1.0)
@@ -684,7 +697,7 @@ GEM
    mime-types-data (3.2020.0512)
    mimemagic (0.3.5)
    mini_histogram (0.1.3)
-    mini_magick (4.9.5)
+    mini_magick (4.10.1)
    mini_mime (1.0.2)
    mini_portile2 (2.4.0)
    minitest (5.11.3)
@@ -713,7 +726,7 @@ GEM
    net-ntp (2.1.3)
    net-ssh (6.0.0)
    netrc (0.11.0)
-    nio4r (2.5.2)
+    nio4r (2.5.4)
    no_proxy_fix (0.1.2)
    nokogiri (1.10.10)
      mini_portile2 (~> 2.4.0)
@@ -817,8 +830,8 @@ GEM
    orm_adapter (0.5.0)
    os (1.0.0)
    parallel (1.19.1)
-    parser (2.7.1.2)
-      ast (~> 2.4.0)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
    parslet (1.8.2)
    peek (1.1.0)
      railties (>= 4.0.0)
@@ -838,7 +851,7 @@ GEM
      parser
      unparser
    procto (0.0.3)
-    prometheus-client-mmap (0.11.0)
+    prometheus-client-mmap (0.12.0)
    pry (0.13.1)
      coderay (~> 1.1)
      method_source (~> 1.0)
@@ -847,10 +860,10 @@ GEM
      pry (~> 0.13.0)
    pry-rails (0.3.9)
      pry (>= 0.10.4)
-    public_suffix (4.0.3)
+    public_suffix (4.0.6)
    pyu-ruby-sasl (0.0.3.3)
    raabro (1.1.6)
-    rack (2.0.9)
+    rack (2.1.4)
    rack-accept (0.4.5)
      rack (>= 0.4)
    rack-attack (6.3.0)
@@ -870,25 +883,25 @@ GEM
    rack-test (1.1.0)
      rack (>= 1.0, < 3)
    rack-timeout (0.5.2)
-    rails (6.0.3.1)
-      actioncable (= 6.0.3.1)
-      actionmailbox (= 6.0.3.1)
-      actionmailer (= 6.0.3.1)
-      actionpack (= 6.0.3.1)
-      actiontext (= 6.0.3.1)
-      actionview (= 6.0.3.1)
-      activejob (= 6.0.3.1)
-      activemodel (= 6.0.3.1)
-      activerecord (= 6.0.3.1)
-      activestorage (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
+    rails (6.0.3.3)
+      actioncable (= 6.0.3.3)
+      actionmailbox (= 6.0.3.3)
+      actionmailer (= 6.0.3.3)
+      actionpack (= 6.0.3.3)
+      actiontext (= 6.0.3.3)
+      actionview (= 6.0.3.3)
+      activejob (= 6.0.3.3)
+      activemodel (= 6.0.3.3)
+      activerecord (= 6.0.3.3)
+      activestorage (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
      bundler (>= 1.3.0)
-      railties (= 6.0.3.1)
+      railties (= 6.0.3.3)
      sprockets-rails (>= 2.0.0)
-    rails-controller-testing (1.0.4)
-      actionpack (>= 5.0.1.x)
-      actionview (>= 5.0.1.x)
-      activesupport (>= 5.0.1.x)
+    rails-controller-testing (1.0.5)
+      actionpack (>= 5.0.1.rc1)
+      actionview (>= 5.0.1.rc1)
+      activesupport (>= 5.0.1.rc1)
    rails-dom-testing (2.0.3)
      activesupport (>= 4.2.0)
      nokogiri (>= 1.6)
@@ -897,9 +910,9 @@ GEM
    rails-i18n (6.0.0)
      i18n (>= 0.7, < 2)
      railties (>= 6.0.0, < 7)
-    railties (6.0.3.1)
-      actionpack (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
+    railties (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
      method_source
      rake (>= 0.8.7)
      thor (>= 0.20.3, < 2.0)
@@ -920,7 +933,7 @@ GEM
    re2 (1.2.0)
    recaptcha (4.13.1)
      json
-    recursive-open-struct (1.1.1)
+    recursive-open-struct (1.1.2)
    redis (4.1.3)
    redis-actionpack (5.2.0)
      actionpack (>= 5, < 7)
@@ -951,7 +964,8 @@ GEM
    responders (3.0.0)
      actionpack (>= 5.0)
      railties (>= 5.0)
-    rest-client (2.0.2)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
      http-cookie (>= 1.0.2, < 2.0)
      mime-types (>= 1.16, < 4.0)
      netrc (~> 0.8)
@@ -959,7 +973,7 @@ GEM
    rexml (3.2.4)
    rinku (2.0.0)
    rotp (2.1.2)
-    rouge (3.21.0)
+    rouge (3.24.0)
    rqrcode (0.7.0)
      chunky_png
    rqrcode-rails3 (0.1.7)
@@ -995,7 +1009,7 @@ GEM
    rspec-support (3.9.2)
    rspec_junit_formatter (0.4.1)
      rspec-core (>= 2, < 4, != 2.12.0)
-    rspec_profiling (0.0.5)
+    rspec_profiling (0.0.6)
      activerecord
      pg
      rails
@@ -1065,7 +1079,7 @@ GEM
    seed-fu (2.3.7)
      activerecord (>= 3.1)
      activesupport (>= 3.1)
-    selenium-webdriver (3.142.6)
+    selenium-webdriver (3.142.7)
      childprocess (>= 0.5, < 4.0)
      rubyzip (>= 1.2.2)
    sentry-raven (3.0.4)
@@ -1096,7 +1110,7 @@ GEM
      simplecov (~> 0.8)
    simplecov-html (0.12.2)
    sixarm_ruby_unaccent (1.2.0)
-    slack-messenger (2.3.3)
+    slack-messenger (2.3.4)
    snowplow-tracker (0.6.1)
      contracts (~> 0.7, <= 0.11)
    spring (2.0.2)
@@ -1106,7 +1120,7 @@ GEM
    sprockets (3.7.2)
      concurrent-ruby (~> 1.0)
      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
      actionpack (>= 4.0)
      activesupport (>= 4.0)
      sprockets (>= 3.0.0)
@@ -1130,6 +1144,8 @@ GEM
    temple (0.8.2)
    terminal-table (1.8.0)
      unicode-display_width (~> 1.1, >= 1.1.1)
+    terser (1.0.2)
+      execjs (>= 0.3.0, < 3)
    test-prof (0.12.0)
    text (1.3.1)
    thin (1.7.2)
@@ -1138,11 +1154,12 @@ GEM
      rack (>= 1, < 3)
    thor (0.20.3)
    thread_safe (0.3.6)
-    thrift (0.11.0.0)
+    thrift (0.13.0)
    tilt (2.0.10)
    timecop (0.9.1)
    timeliness (0.3.10)
    timfel-krb5-auth (0.8.3)
+    to_regexp (0.2.1)
    toml (0.2.0)
      parslet (~> 1.8.0)
    toml-rb (1.0.0)
@@ -1157,12 +1174,9 @@ GEM
      thread_safe (~> 0.1)
    u2f (0.2.1)
    uber (0.1.0)
-    uglifier (2.7.2)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
    unf (0.1.4)
      unf_ext
-    unf_ext (0.0.7.5)
+    unf_ext (0.0.7.7)
    unicode-display_width (1.7.0)
    unicode_plot (0.0.4)
      enumerable-statistics (>= 2.0.1)
@@ -1214,13 +1228,11 @@ GEM
    webfinger (1.1.0)
      activesupport
      httpclient (>= 2.4)
-    webmock (3.5.1)
+    webmock (3.9.1)
      addressable (>= 2.3.6)
      crack (>= 0.3.2)
-      hashdiff
-    webpack-rails (0.9.11)
-      railties (>= 3.2.0)
-    websocket-driver (0.7.1)
+      hashdiff (>= 0.4.0, < 2.0.0)
+    websocket-driver (0.7.3)
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.5)
    wikicloth (0.8.1)
@@ -1232,7 +1244,7 @@ GEM
    xpath (3.2.0)
      nokogiri (~> 1.8)
    yajl-ruby (1.4.1)
-    zeitwerk (2.3.0)
+    zeitwerk (2.4.0)

 PLATFORMS
  ruby
@@ -1259,6 +1271,7 @@ DEPENDENCIES
  babosa (~> 1.0.2)
  base32 (~> 0.3.0)
  batch-loader (~> 1.4.0)
+  bcrypt (= 3.1.12)
  bcrypt_pbkdf (~> 1.0)
  benchmark-ips (~> 2.3.0)
  benchmark-memory (~> 0.1)
@@ -1272,19 +1285,19 @@ DEPENDENCIES
  capybara (~> 3.33.0)
  capybara-screenshot (~> 1.0.22)
  carrierwave (~> 1.3)
-  charlock_holmes (~> 0.7.5)
+  charlock_holmes (~> 0.7.7)
  commonmarker (~> 0.20)
  concurrent-ruby (~> 1.1)
  connection_pool (~> 2.0)
  countries (~> 3.0)
  creole (~> 0.5.0)
-  danger (~> 8.0)
+  danger (~> 8.0.6)
  database_cleaner (~> 1.7.0)
  deckar01-task_list (= 2.3.1)
  default_value_for (~> 3.3.0)
  derailed_benchmarks
  device_detector
-  devise (~> 4.6)
+  devise (~> 4.7.2)
  devise-two-factor (~> 3.1.0)
  diff_match_patch (~> 0.1.0)
  diffy (~> 3.3)
@@ -1322,15 +1335,16 @@ DEPENDENCIES
  gettext (~> 3.3)
  gettext_i18n_rails (~> 1.8.0)
  gettext_i18n_rails_js (~> 1.3)
-  gitaly (~> 13.3.0.pre.rc1)
+  gitaly (~> 13.5.0.pre.rc2)
  github-markup (~> 1.7.0)
  gitlab-chronic (~> 0.10.5)
-  gitlab-fog-azure-rm (~> 0.9)
-  gitlab-labkit (= 0.12.1)
+  gitlab-fog-azure-rm (~> 1.0)
+  gitlab-labkit (= 0.13.1)
  gitlab-license (~> 1.0)
-  gitlab-mail_room (~> 0.0.6)
+  gitlab-mail_room (~> 0.0.7)
  gitlab-markup (~> 1.7.1)
  gitlab-net-dns (~> 0.9.1)
+  gitlab-pg_query (~> 1.3)
  gitlab-puma (~> 4.3.3.gitlab.2)
  gitlab-puma_worker_killer (~> 0.1.1.gitlab.1)
  gitlab-sidekiq-fetcher (= 0.5.2)
@@ -1343,10 +1357,11 @@ DEPENDENCIES
  gpgme (~> 2.0.19)
  grape (= 1.4.0)
  grape-entity (~> 0.7.1)
-  grape-path-helpers (~> 1.3)
+  grape-path-helpers (~> 1.4)
  grape_logging (~> 1.7)
  graphiql-rails (~> 1.4.10)
-  graphql (~> 1.10.5)
+  graphlient (~> 0.4.0)
+  graphql (~> 1.11.4)
  graphql-docs (~> 1.6.0)
  grpc (~> 1.30.2)
  gssapi
@@ -1354,6 +1369,7 @@ DEPENDENCIES
  haml_lint (~> 0.34.0)
  hamlit (~> 2.11.0)
  hangouts-chat (~> 0.0.5)
+  hashie
  hashie-forbidden_attributes
  health_check (~> 3.0)
  hipchat (~> 1.5.0)
@@ -1362,6 +1378,7 @@ DEPENDENCIES
  httparty (~> 0.16.4)
  icalendar
  invisible_captcha (~> 0.12.1)
+  ipaddress (~> 0.8.3)
  jira-ruby (~> 2.0.0)
  js_regex (~> 3.4)
  json (~> 2.3.0)
@@ -1371,9 +1388,9 @@ DEPENDENCIES
  kaminari (~> 1.0)
  knapsack (~> 1.17)
  kramdown (~> 2.3.0)
-  kubeclient (~> 4.6.0)
+  kubeclient (~> 4.9.1)
  letter_opener_web (~> 1.3.4)
-  license_finder (~> 5.4)
+  license_finder (~> 6.0)
  licensee (~> 8.9)
  lockbox (~> 0.3.3)
  lograge (~> 0.5)
@@ -1384,7 +1401,7 @@ DEPENDENCIES
  memory_profiler (~> 0.9)
  method_source (~> 1.0)
  mimemagic (~> 0.3.2)
-  mini_magick
+  mini_magick (~> 4.10.1)
  minitest (~> 5.11.0)
  multi_json (~> 1.14.1)
  nakayoshi_fork (~> 0.0.4)
@@ -1419,10 +1436,10 @@ DEPENDENCIES
  pg (~> 1.1)
  png_quantizator (~> 0.2.1)
  premailer-rails (~> 1.10.3)
-  prometheus-client-mmap (~> 0.11.0)
+  prometheus-client-mmap (~> 0.12.0)
  pry-byebug (~> 3.9.0)
  pry-rails (~> 0.3.9)
-  rack (~> 2.0.9)
+  rack (~> 2.1.4)
  rack-attack (~> 6.3.0)
  rack-cors (~> 1.0.6)
  rack-oauth2 (~> 1.9.3)
@@ -1444,13 +1461,13 @@ DEPENDENCIES
  request_store (~> 1.5)
  responders (~> 3.0)
  retriable (~> 3.1.2)
-  rouge (~> 3.21.0)
+  rouge (~> 3.24.0)
  rqrcode-rails3 (~> 0.1.7)
  rspec-parameterized
  rspec-rails (~> 4.0.0)
  rspec-retry (~> 0.6.1)
  rspec_junit_formatter
-  rspec_profiling (~> 0.0.5)
+  rspec_profiling (~> 0.0.6)
  rubocop (~> 0.82.0)
  rubocop-performance (~> 1.5.2)
  rubocop-rspec (~> 1.37.0)
@@ -1473,7 +1490,7 @@ DEPENDENCIES
  simple_po_parser (~> 1.1.2)
  simplecov (~> 0.18.5)
  simplecov-cobertura (~> 1.3.1)
-  slack-messenger (~> 2.3.3)
+  slack-messenger (~> 2.3.4)
  snowplow-tracker (~> 0.6.1)
  spring (~> 2.0.0)
  spring-commands-rspec (~> 1.0.4)
@@ -1482,13 +1499,13 @@ DEPENDENCIES
  stackprof (~> 0.2.15)
  state_machines-activerecord (~> 0.6.0)
  sys-filesystem (~> 1.1.6)
+  terser (= 1.0.2)
  test-prof (~> 0.12.0)
  thin (~> 1.7.0)
  timecop (~> 0.9.1)
  toml-rb (~> 1.0.0)
  truncato (~> 0.7.11)
  u2f (~> 0.2.1)
-  uglifier (~> 2.7.2)
  unf (~> 0.1.4)
  unicorn (~> 5.5)
  unicorn-worker-killer (~> 0.4.4)
@@ -1498,8 +1515,7 @@ DEPENDENCIES
  version_sorter (~> 2.2.4)
  vmstat (~> 2.3.0)
  webauthn (~> 2.3)
-  webmock (~> 3.5.1)
-  webpack-rails (~> 0.9.10)
+  webmock (~> 3.9.1)
  wikicloth (= 0.8.1)
  yajl-ruby (~> 1.4.1)


--- a/PROCESS.md
+++ b/PROCESS.md
@@ -73,7 +73,7 @@ sensitive as to how you word things. Use Emoji to express your feelings (heart,
 star, smile, etc.). Some good tips about code reviews can be found in our
 [Code Review Guidelines].

-[Code Review Guidelines]: https://docs.gitlab.com/ce/development/code_review.html
+[Code Review Guidelines]: https://docs.gitlab.com/ee/development/code_review.html

 ## Feature flags

@@ -217,5 +217,5 @@ rebase with master to see if that solves the issue.

 [team]: https://about.gitlab.com/team/
 [done]: https://docs.gitlab.com/ee/development/contributing/merge_request_workflow.html#definition-of-done
-[automatic_ce_ee_merge]: https://docs.gitlab.com/ce/development/automatic_ce_ee_merge.html
-[ee_features]: https://docs.gitlab.com/ce/development/ee_features.html
+[automatic_ce_ee_merge]: https://docs.gitlab.com/ee/development/automatic_ce_ee_merge.html
+[ee_features]: https://docs.gitlab.com/ee/development/ee_features.html
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@

 The canonical source of GitLab where all development takes place is [hosted on GitLab.com](https://gitlab.com/gitlab-org/gitlab).

-If you wish to clone a copy of GitLab without proprietary code, you can use the read-only mirror of GitLab located at https://gitlab.com/gitlab-org/gitlab-foss/. Please do not submit any issues and/or merge requests to this project.
+If you wish to clone a copy of GitLab without proprietary code, you can use the read-only mirror of GitLab located at https://gitlab.com/gitlab-org/gitlab-foss/. However, please do not submit any issues and/or merge requests to that project.

 ## Free trial

@@ -79,7 +79,7 @@ Instructions on how to start GitLab and how to run the tests can be found in the
 GitLab is a Ruby on Rails application that runs on the following software:

 - Ubuntu/Debian/CentOS/RHEL/OpenSUSE
- Ruby (MRI) 2.6.6
+- Ruby (MRI) 2.7.2
 - Git 2.24+
 - Redis 4.0+
 - PostgreSQL 11+

--- a/VERSION
+++ b/VERSION
-13.4.0-pre
+13.6.0-pre
\ No newline at end of file
--- a/app/assets/javascripts/admin/cohorts/components/usage_ping_disabled.vue
+++ b/app/assets/javascripts/admin/cohorts/components/usage_ping_disabled.vue
@@ -9,13 +9,13 @@ export default {
  },
  inject: {
    svgPath: {
-      type: String,
+      default: '',
    },
    docsLink: {
-      type: String,
+      default: '',
    },
    primaryButtonPath: {
-      type: String,
+      default: '',
    },
  },
 };

--- a/app/assets/javascripts/admin/dev_ops_report/components/usage_ping_disabled.vue
+++ b/app/assets/javascripts/admin/dev_ops_report/components/usage_ping_disabled.vue
@@ -10,16 +10,16 @@ export default {
  },
  inject: {
    isAdmin: {
-      type: Boolean,
+      default: false,
    },
    svgPath: {
-      type: String,
+      default: '',
    },
    docsLink: {
-      type: String,
+      default: '',
    },
    primaryButtonPath: {
-      type: String,
+      default: '',
    },
  },
 };

--- a/app/assets/javascripts/alert_handler.js
+++ b/app/assets/javascripts/alert_handler.js
-// This allows us to dismiss alerts that we've migrated from bootstrap
-// Note: This ONLY works on alerts that are created on page load
+// This allows us to dismiss alerts and banners that we've migrated from bootstrap
+// Note: This ONLY works on elements that are created on page load
 // You can follow this effort in the following epic
 // https://gitlab.com/groups/gitlab-org/-/epics/4070

 export default function initAlertHandler() {
-  const ALERT_SELECTOR = '.gl-alert';
-  const CLOSE_SELECTOR = '.gl-alert-dismiss';
+  const DISMISSIBLE_SELECTORS = ['.gl-alert', '.gl-banner'];
+  const DISMISS_LABEL = '[aria-label="Dismiss"]';
+  const DISMISS_CLASS = '.gl-alert-dismiss';

-  const dismissAlert = ({ target }) => target.closest(ALERT_SELECTOR).remove();
-  const closeButtons = document.querySelectorAll(`${ALERT_SELECTOR} ${CLOSE_SELECTOR}`);
-  closeButtons.forEach(alert => alert.addEventListener('click', dismissAlert));
+  DISMISSIBLE_SELECTORS.forEach(selector => {
+    const elements = document.querySelectorAll(selector);
+    elements.forEach(element => {
+      const button = element.querySelector(DISMISS_LABEL) || element.querySelector(DISMISS_CLASS);
+      if (!button) {
+        return;
+      }
+      button.addEventListener('click', () => element.remove());
+    });
+  });
 }
--- a/app/assets/javascripts/alert_management/components/alert_details.vue
+++ b/app/assets/javascripts/alert_management/components/alert_details.vue
 <script>
-/* eslint-disable vue/no-v-html */
-import * as Sentry from '@sentry/browser';
 import {
  GlAlert,
  GlBadge,
  GlIcon,
+  GlLink,
  GlLoadingIcon,
  GlSprintf,
  GlTabs,
  GlTab,
  GlButton,
+  GlSafeHtmlDirective,
 } from '@gitlab/ui';
+import * as Sentry from '~/sentry/wrapper';
 import { s__ } from '~/locale';
 import alertQuery from '../graphql/queries/details.query.graphql';
 import sidebarStatusQuery from '../graphql/queries/sidebar_status.query.graphql';
@@ -28,6 +29,8 @@ import SystemNote from './system_notes/system_note.vue';
 import AlertSidebar from './alert_sidebar.vue';
 import AlertMetrics from './alert_metrics.vue';
 import AlertDetailsTable from '~/vue_shared/components/alert_details_table.vue';
+import AlertSummaryRow from './alert_summary_row.vue';
+import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';

 const containerEl = document.querySelector('.page-with-contextual-sidebar');

@@ -39,6 +42,9 @@ export default {
    reportedAt: s__('AlertManagement|Reported %{when}'),
    reportedAtWithTool: s__('AlertManagement|Reported %{when} by %{tool}'),
  },
+  directives: {
+    SafeHtml: GlSafeHtmlDirective,
+  },
  severityLabels: ALERTS_SEVERITY_LABELS,
  tabsConfig: [
    {
@@ -56,9 +62,11 @@ export default {
  ],
  components: {
    AlertDetailsTable,
+    AlertSummaryRow,
    GlBadge,
    GlAlert,
    GlIcon,
+    GlLink,
    GlLoadingIcon,
    GlSprintf,
    GlTab,
@@ -69,20 +77,18 @@ export default {
    SystemNote,
    AlertMetrics,
  },
+  mixins: [glFeatureFlagsMixin()],
  inject: {
    projectPath: {
      default: '',
    },
    alertId: {
-      type: String,
      default: '',
    },
    projectId: {
-      type: String,
      default: '',
    },
    projectIssuesPath: {
-      type: String,
      default: '',
    },
  },
@@ -143,6 +149,15 @@ export default {
        this.$router.replace({ name: 'tab', params: { tabId } });
      },
    },
+    environmentName() {
+      return this.shouldDisplayEnvironment && this.alert?.environment?.name;
+    },
+    environmentPath() {
+      return this.shouldDisplayEnvironment && this.alert?.environment?.path;
+    },
+    shouldDisplayEnvironment() {
+      return this.glFeatures.exposeEnvironmentPathInAlertDetails;
+    },
  },
  mounted() {
    this.trackPageViews();
@@ -211,7 +226,7 @@ export default {
 <template>
  <div>
    <gl-alert v-if="showErrorMsg" variant="danger" @dismiss="dismissError">
-      <p v-html="sidebarErrorMessage || $options.i18n.errorMsg"></p>
+      <p v-safe-html="sidebarErrorMessage || $options.i18n.errorMsg"></p>
    </gl-alert>
    <gl-alert
      v-if="createIncidentError"
@@ -270,10 +285,9 @@ export default {
          variant="default"
          class="d-sm-none gl-absolute toggle-sidebar-mobile-button"
          type="button"
+          icon="chevron-double-lg-left"
          @click="toggleSidebar"
-        >
-          <i class="fa fa-angle-double-left"></i>
-        </gl-button>
+        />
      </div>
      <div
        v-if="alert"
@@ -283,54 +297,65 @@ export default {
      </div>
      <gl-tabs v-if="alert" v-model="currentTabIndex" data-testid="alertDetailsTabs">
        <gl-tab :data-testid="$options.tabsConfig[0].id" :title="$options.tabsConfig[0].title">
-          <div v-if="alert.severity" class="gl-mt-3 gl-mb-5 gl-display-flex">
-            <div class="gl-font-weight-bold gl-w-13 gl-text-right gl-pr-3">
-              {{ s__('AlertManagement|Severity') }}:
-            </div>
-            <div class="gl-pl-2" data-testid="severity">
-              <span>
-                <gl-icon
-                  class="gl-vertical-align-middle"
-                  :size="12"
-                  :name="`severity-${alert.severity.toLowerCase()}`"
-                  :class="`icon-${alert.severity.toLowerCase()}`"
-                />
-              </span>
+          <alert-summary-row v-if="alert.severity" :label="`${s__('AlertManagement|Severity')}:`">
+            <span data-testid="severity">
+              <gl-icon
+                class="gl-vertical-align-middle"
+                :size="12"
+                :name="`severity-${alert.severity.toLowerCase()}`"
+                :class="`icon-${alert.severity.toLowerCase()}`"
+              />
              {{ $options.severityLabels[alert.severity] }}
-            </div>
-          </div>
-          <div v-if="alert.startedAt" class="gl-my-5 gl-display-flex">
-            <div class="gl-font-weight-bold gl-w-13 gl-text-right gl-pr-3">
-              {{ s__('AlertManagement|Start time') }}:
-            </div>
-            <div class="gl-pl-2">
-              <time-ago-tooltip data-testid="startTimeItem" :time="alert.startedAt" />
-            </div>
-          </div>
-          <div v-if="alert.eventCount" class="gl-my-5 gl-display-flex">
-            <div class="gl-font-weight-bold gl-w-13 gl-text-right gl-pr-3">
-              {{ s__('AlertManagement|Events') }}:
-            </div>
-            <div class="gl-pl-2" data-testid="eventCount">{{ alert.eventCount }}</div>
-          </div>
-          <div v-if="alert.monitoringTool" class="gl-my-5 gl-display-flex">
-            <div class="gl-font-weight-bold gl-w-13 gl-text-right gl-pr-3">
-              {{ s__('AlertManagement|Tool') }}:
-            </div>
-            <div class="gl-pl-2" data-testid="monitoringTool">{{ alert.monitoringTool }}</div>
-          </div>
-          <div v-if="alert.service" class="gl-my-5 gl-display-flex">
-            <div class="bold gl-w-13 gl-text-right gl-pr-3">
-              {{ s__('AlertManagement|Service') }}:
-            </div>
-            <div class="gl-pl-2" data-testid="service">{{ alert.service }}</div>
-          </div>
-          <div v-if="alert.runbook" class="gl-my-5 gl-display-flex">
-            <div class="bold gl-w-13 gl-text-right gl-pr-3">
-              {{ s__('AlertManagement|Runbook') }}:
-            </div>
-            <div class="gl-pl-2" data-testid="runbook">{{ alert.runbook }}</div>
-          </div>
+            </span>
+          </alert-summary-row>
+          <alert-summary-row
+            v-if="environmentName"
+            :label="`${s__('AlertManagement|Environment')}:`"
+          >
+            <gl-link
+              v-if="environmentPath"
+              class="gl-display-inline-block"
+              data-testid="environmentPath"
+              :href="environmentPath"
+            >
+              {{ environmentName }}
+            </gl-link>
+            <span v-else data-testid="environmentName">{{ environmentName }}</span>
+          </alert-summary-row>
+          <alert-summary-row
+            v-if="alert.startedAt"
+            :label="`${s__('AlertManagement|Start time')}:`"
+          >
+            <time-ago-tooltip data-testid="startTimeItem" :time="alert.startedAt" />
+          </alert-summary-row>
+          <alert-summary-row
+            v-if="alert.eventCount"
+            :label="`${s__('AlertManagement|Events')}:`"
+            data-testid="eventCount"
+          >
+            {{ alert.eventCount }}
+          </alert-summary-row>
+          <alert-summary-row
+            v-if="alert.monitoringTool"
+            :label="`${s__('AlertManagement|Tool')}:`"
+            data-testid="monitoringTool"
+          >
+            {{ alert.monitoringTool }}
+          </alert-summary-row>
+          <alert-summary-row
+            v-if="alert.service"
+            :label="`${s__('AlertManagement|Service')}:`"
+            data-testid="service"
+          >
+            {{ alert.service }}
+          </alert-summary-row>
+          <alert-summary-row
+            v-if="alert.runbook"
+            :label="`${s__('AlertManagement|Runbook')}:`"
+            data-testid="runbook"
+          >
+            {{ alert.runbook }}
+          </alert-summary-row>
          <alert-details-table :alert="alert" :loading="loading" />
        </gl-tab>
        <gl-tab :data-testid="$options.tabsConfig[1].id" :title="$options.tabsConfig[1].title">

--- a/app/assets/javascripts/alert_management/components/alert_management_empty_state.vue
+++ b/app/assets/javascripts/alert_management/components/alert_management_empty_state.vue
@@ -33,30 +33,13 @@ export default {
      query: alertsHelpUrlQuery,
    },
  },
-  props: {
-    enableAlertManagementPath: {
-      type: String,
-      required: true,
-    },
-    userCanEnableAlertManagement: {
-      type: Boolean,
-      required: true,
-    },
-    emptyAlertSvgPath: {
-      type: String,
-      required: true,
-    },
-    opsgenieMvcEnabled: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
-    opsgenieMvcTargetUrl: {
-      type: String,
-      required: false,
-      default: '',
-    },
-  },
+  inject: [
+    'enableAlertManagementPath',
+    'userCanEnableAlertManagement',
+    'emptyAlertSvgPath',
+    'opsgenieMvcEnabled',
+    'opsgenieMvcTargetUrl',
+  ],
  data() {
    return {
      alertsHelpUrl: '',

--- a/app/assets/javascripts/alert_management/components/alert_management_list_wrapper.vue
+++ b/app/assets/javascripts/alert_management/components/alert_management_list_wrapper.vue
 <script>
-import Tracking from '~/tracking';
-import { trackAlertListViewsOptions } from '../constants';
 import AlertManagementEmptyState from './alert_management_empty_state.vue';
 import AlertManagementTable from './alert_management_table.vue';

@@ -9,67 +7,12 @@ export default {
    AlertManagementEmptyState,
    AlertManagementTable,
  },
-  props: {
-    projectPath: {
-      type: String,
-      required: true,
-    },
-    alertManagementEnabled: {
-      type: Boolean,
-      required: true,
-    },
-    enableAlertManagementPath: {
-      type: String,
-      required: true,
-    },
-    populatingAlertsHelpUrl: {
-      type: String,
-      required: true,
-    },
-    userCanEnableAlertManagement: {
-      type: Boolean,
-      required: true,
-    },
-    emptyAlertSvgPath: {
-      type: String,
-      required: true,
-    },
-    opsgenieMvcEnabled: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
-    opsgenieMvcTargetUrl: {
-      type: String,
-      required: false,
-      default: '',
-    },
-  },
-  mounted() {
-    this.trackPageViews();
-  },
-  methods: {
-    trackPageViews() {
-      const { category, action } = trackAlertListViewsOptions;
-      Tracking.event(category, action);
-    },
-  },
+  inject: ['alertManagementEnabled'],
 };
 </script>
 <template>
  <div>
-    <alert-management-table
-      v-if="alertManagementEnabled"
-      :populating-alerts-help-url="populatingAlertsHelpUrl"
-      :project-path="projectPath"
-    />
-    <alert-management-empty-state
-      v-else
-      :empty-alert-svg-path="emptyAlertSvgPath"
-      :enable-alert-management-path="enableAlertManagementPath"
-      :user-can-enable-alert-management="userCanEnableAlertManagement"
-      :opsgenie-mvc-enabled="opsgenieMvcEnabled"
-      :opsgenie-mvc-target-url="opsgenieMvcTargetUrl"
-    />
+    <alert-management-table v-if="alertManagementEnabled" />
+    <alert-management-empty-state v-else />
  </div>
 </template>
--- a/app/assets/javascripts/alert_management/components/alert_management_table.vue
+++ b/app/assets/javascripts/alert_management/components/alert_management_table.vue
 <script>
-/* eslint-disable vue/no-v-html */
 import {
+  GlAlert,
  GlLoadingIcon,
  GlTable,
-  GlAlert,
  GlAvatarsInline,
  GlAvatarLink,
  GlAvatar,
  GlIcon,
  GlLink,
-  GlTabs,
-  GlTab,
-  GlBadge,
-  GlPagination,
-  GlSearchBoxByType,
  GlSprintf,
  GlTooltipDirective,
 } from '@gitlab/ui';
-import { debounce, trim } from 'lodash';
-import { __, s__ } from '~/locale';
-import { joinPaths, visitUrl } from '~/lib/utils/url_utility';
+import { s__, __ } from '~/locale';
 import { fetchPolicies } from '~/lib/graphql';
+import { joinPaths, visitUrl } from '~/lib/utils/url_utility';
+import PaginatedTableWithSearchAndTabs from '~/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue';
+import {
+  tdClass,
+  thClass,
+  bodyTrClass,
+  initialPaginationState,
+} from '~/vue_shared/components/paginated_table_with_search_and_tabs/constants';
 import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue';
 import { convertToSnakeCase } from '~/lib/utils/text_utility';
-import Tracking from '~/tracking';
 import getAlerts from '../graphql/queries/get_alerts.query.graphql';
 import getAlertsCountByStatus from '../graphql/queries/get_count_by_status.query.graphql';
 import {
  ALERTS_STATUS_TABS,
  ALERTS_SEVERITY_LABELS,
-  DEFAULT_PAGE_SIZE,
  trackAlertListViewsOptions,
-  trackAlertStatusUpdateOptions,
 } from '../constants';
 import AlertStatus from './alert_status.vue';

-const tdClass =
-  'table-col gl-display-flex d-md-table-cell gl-align-items-center gl-white-space-nowrap';
-const thClass = 'gl-hover-bg-blue-50';
-const bodyTrClass =
-  'gl-border-1 gl-border-t-solid gl-border-gray-100 gl-hover-bg-blue-50 gl-hover-cursor-pointer gl-hover-border-b-solid gl-hover-border-blue-200';
 const TH_TEST_ID = { 'data-testid': 'alert-management-severity-sort' };

-const initialPaginationState = {
-  currentPage: 1,
-  prevPageCursor: '',
-  nextPageCursor: '',
-  firstPageSize: DEFAULT_PAGE_SIZE,
-  lastPageSize: null,
-};
-
 const TWELVE_HOURS_IN_MS = 12 * 60 * 60 * 1000;

 export default {
+  trackAlertListViewsOptions,
  i18n: {
    noAlertsMsg: s__(
      'AlertManagement|No alerts available to display. See %{linkStart}enabling alert management%{linkEnd} for more information on adding alerts to the list.',
@@ -60,7 +45,6 @@ export default {
    errorMsg: s__(
      "AlertManagement|There was an error displaying the alerts. Confirm your endpoint's configuration details to ensure alerts appear.",
    ),
-    searchPlaceholder: __('Search or filter results...'),
    unassigned: __('Unassigned'),
  },
  fields: [
@@ -94,7 +78,7 @@ export default {
    },
    {
      key: 'issue',
-      label: s__('AlertManagement|Issue'),
+      label: s__('AlertManagement|Incident'),
      thClass: 'gl-w-12 gl-pointer-events-none',
      tdClass,
    },
@@ -115,36 +99,23 @@ export default {
  severityLabels: ALERTS_SEVERITY_LABELS,
  statusTabs: ALERTS_STATUS_TABS,
  components: {
+    GlAlert,
    GlLoadingIcon,
    GlTable,
-    GlAlert,
    GlAvatarsInline,
    GlAvatarLink,
    GlAvatar,
    TimeAgo,
    GlIcon,
    GlLink,
-    GlTabs,
-    GlTab,
-    GlBadge,
-    GlPagination,
-    GlSearchBoxByType,
    GlSprintf,
    AlertStatus,
+    PaginatedTableWithSearchAndTabs,
  },
  directives: {
    GlTooltip: GlTooltipDirective,
  },
-  props: {
-    projectPath: {
-      type: String,
-      required: true,
-    },
-    populatingAlertsHelpUrl: {
-      type: String,
-      required: true,
-    },
-  },
+  inject: ['projectPath', 'textQuery', 'assigneeUsernameQuery', 'populatingAlertsHelpUrl'],
  apollo: {
    alerts: {
      fetchPolicy: fetchPolicies.CACHE_AND_NETWORK,
@@ -152,6 +123,7 @@ export default {
      variables() {
        return {
          searchTerm: this.searchTerm,
+          assigneeUsername: this.assigneeUsername,
          projectPath: this.projectPath,
          statuses: this.statusFilter,
          sort: this.sort,
@@ -182,14 +154,16 @@ export default {
        };
      },
      error() {
-        this.hasError = true;
+        this.errored = true;
      },
    },
    alertsCount: {
+      fetchPolicy: fetchPolicies.CACHE_AND_NETWORK,
      query: getAlertsCountByStatus,
      variables() {
        return {
          searchTerm: this.searchTerm,
+          assigneeUsername: this.assigneeUsername,
          projectPath: this.projectPath,
        };
      },
@@ -200,83 +174,53 @@ export default {
  },
  data() {
    return {
-      searchTerm: '',
-      hasError: false,
-      errorMessage: '',
-      isAlertDismissed: false,
+      errored: false,
+      serverErrorMessage: '',
+      isErrorAlertDismissed: false,
      sort: 'STARTED_AT_DESC',
      statusFilter: [],
      filteredByStatus: '',
-      pagination: initialPaginationState,
+      alerts: {},
+      alertsCount: {},
      sortBy: 'startedAt',
      sortDesc: true,
      sortDirection: 'desc',
+      searchTerm: this.textQuery,
+      assigneeUsername: this.assigneeUsernameQuery,
+      pagination: initialPaginationState,
    };
  },
  computed: {
+    showErrorMsg() {
+      return this.errored && !this.isErrorAlertDismissed;
+    },
    showNoAlertsMsg() {
      return (
-        !this.hasError &&
+        !this.errored &&
        !this.loading &&
        this.alertsCount?.all === 0 &&
        !this.searchTerm &&
-        !this.isAlertDismissed
+        !this.assigneeUsername &&
+        !this.isErrorAlertDismissed
      );
    },
    loading() {
      return this.$apollo.queries.alerts.loading;
    },
-    hasAlerts() {
-      return this.alerts?.list?.length;
-    },
-    showPaginationControls() {
-      return Boolean(this.prevPage || this.nextPage);
-    },
-    alertsForCurrentTab() {
-      return this.alertsCount ? this.alertsCount[this.filteredByStatus.toLowerCase()] : 0;
-    },
-    prevPage() {
-      return Math.max(this.pagination.currentPage - 1, 0);
-    },
-    nextPage() {
-      const nextPage = this.pagination.currentPage + 1;
-      return nextPage > Math.ceil(this.alertsForCurrentTab / DEFAULT_PAGE_SIZE) ? null : nextPage;
+    isEmpty() {
+      return !this.alerts?.list?.length;
    },
  },
-  mounted() {
-    this.trackPageViews();
-  },
  methods: {
-    filterAlertsByStatus(tabIndex) {
-      this.resetPagination();
-      const { filters, status } = this.$options.statusTabs[tabIndex];
-      this.statusFilter = filters;
-      this.filteredByStatus = status;
-    },
    fetchSortedData({ sortBy, sortDesc }) {
      const sortingDirection = sortDesc ? 'DESC' : 'ASC';
      const sortingColumn = convertToSnakeCase(sortBy).toUpperCase();

-      this.resetPagination();
+      this.pagination = initialPaginationState;
      this.sort = `${sortingColumn}_${sortingDirection}`;
    },
-    onInputChange: debounce(function debounceSearch(input) {
-      const trimmedInput = trim(input);
-      if (trimmedInput !== this.searchTerm) {
-        this.resetPagination();
-        this.searchTerm = trimmedInput;
-      }
-    }, 500),
-    navigateToAlertDetails({ iid }) {
-      return visitUrl(joinPaths(window.location.pathname, iid, 'details'));
-    },
-    trackPageViews() {
-      const { category, action } = trackAlertListViewsOptions;
-      Tracking.event(category, action);
-    },
-    trackStatusUpdate(status) {
-      const { category, action, label } = trackAlertStatusUpdateOptions;
-      Tracking.event(category, action, { label, property: status });
+    navigateToAlertDetails({ iid }, index, { metaKey }) {
+      return visitUrl(joinPaths(window.location.pathname, iid, 'details'), metaKey);
    },
    hasAssignees(assignees) {
      return Boolean(assignees.nodes?.length);
@@ -284,204 +228,180 @@ export default {
    getIssueLink(item) {
      return joinPaths('/', this.projectPath, '-', 'issues', item.issueIid);
    },
-    handlePageChange(page) {
-      const { startCursor, endCursor } = this.alerts.pageInfo;
-
-      if (page > this.pagination.currentPage) {
-        this.pagination = {
-          ...initialPaginationState,
-          nextPageCursor: endCursor,
-          currentPage: page,
-        };
-      } else {
-        this.pagination = {
-          lastPageSize: DEFAULT_PAGE_SIZE,
-          firstPageSize: null,
-          prevPageCursor: startCursor,
-          nextPageCursor: '',
-          currentPage: page,
-        };
-      }
-    },
-    resetPagination() {
-      this.pagination = initialPaginationState;
-    },
    tbodyTrClass(item) {
      return {
-        [bodyTrClass]: !this.loading && this.hasAlerts,
+        [bodyTrClass]: !this.loading && !this.isEmpty,
        'new-alert': item?.isNew,
      };
    },
    handleAlertError(errorMessage) {
-      this.hasError = true;
-      this.errorMessage = errorMessage;
+      this.errored = true;
+      this.serverErrorMessage = errorMessage;
    },
-    dismissError() {
-      this.hasError = false;
-      this.errorMessage = '';
+    handleStatusUpdate() {
+      this.$apollo.queries.alerts.refetch();
+      this.$apollo.queries.alertsCount.refetch();
+    },
+    pageChanged(pagination) {
+      this.pagination = pagination;
+    },
+    statusChanged({ filters, status }) {
+      this.statusFilter = filters;
+      this.filteredByStatus = status;
+    },
+    filtersChanged({ searchTerm, assigneeUsername }) {
+      this.searchTerm = searchTerm;
+      this.assigneeUsername = assigneeUsername;
+    },
+    errorAlertDismissed() {
+      this.errored = false;
+      this.serverErrorMessage = '';
+      this.isErrorAlertDismissed = true;
    },
  },
 };
 </script>
 <template>
  <div>
-    <div class="incident-management-list">
-      <gl-alert v-if="showNoAlertsMsg" @dismiss="isAlertDismissed = true">
-        <gl-sprintf :message="$options.i18n.noAlertsMsg">
-          <template #link="{ content }">
-            <gl-link
-              class="gl-display-inline-block"
-              :href="populatingAlertsHelpUrl"
-              target="_blank"
-            >
-              {{ content }}
-            </gl-link>
-          </template>
-        </gl-sprintf>
-      </gl-alert>
-      <gl-alert v-if="hasError" variant="danger" data-testid="alert-error" @dismiss="dismissError">
-        <p v-html="errorMessage || $options.i18n.errorMsg"></p>
-      </gl-alert>
-
-      <gl-tabs
-        content-class="gl-p-0 gl-border-b-solid gl-border-b-1 gl-border-gray-100"
-        @input="filterAlertsByStatus"
-      >
-        <gl-tab v-for="tab in $options.statusTabs" :key="tab.status">
-          <template slot="title">
-            <span>{{ tab.title }}</span>
-            <gl-badge v-if="alertsCount" pill size="sm" class="gl-tab-counter-badge">
-              {{ alertsCount[tab.status.toLowerCase()] }}
-            </gl-badge>
-          </template>
-        </gl-tab>
-      </gl-tabs>
+    <gl-alert v-if="showNoAlertsMsg" @dismiss="errorAlertDismissed">
+      <gl-sprintf :message="$options.i18n.noAlertsMsg">
+        <template #link="{ content }">
+          <gl-link class="gl-display-inline-block" :href="populatingAlertsHelpUrl" target="_blank">
+            {{ content }}
+          </gl-link>
+        </template>
+      </gl-sprintf>
+    </gl-alert>

-      <div class="gl-bg-gray-10 gl-p-5 gl-border-b-solid gl-border-b-1 gl-border-gray-100">
-        <gl-search-box-by-type
-          class="gl-bg-white"
-          :placeholder="$options.i18n.searchPlaceholder"
-          @input="onInputChange"
-        />
-      </div>
+    <paginated-table-with-search-and-tabs
+      :show-error-msg="showErrorMsg"
+      :i18n="$options.i18n"
+      :items="alerts.list || []"
+      :page-info="alerts.pageInfo"
+      :items-count="alertsCount"
+      :status-tabs="$options.statusTabs"
+      :track-views-options="$options.trackAlertListViewsOptions"
+      :server-error-message="serverErrorMessage"
+      :filter-search-tokens="['assignee_username']"
+      filter-search-key="alerts"
+      @page-changed="pageChanged"
+      @tabs-changed="statusChanged"
+      @filters-changed="filtersChanged"
+      @error-alert-dismissed="errorAlertDismissed"
+    >
+      <template #header-actions></template>

-      <h4 class="d-block d-md-none my-3">
+      <template #title>
        {{ s__('AlertManagement|Alerts') }}
-      </h4>
-      <gl-table
-        class="alert-management-table"
-        :items="alerts ? alerts.list : []"
-        :fields="$options.fields"
-        :show-empty="true"
-        :busy="loading"
-        stacked="md"
-        :tbody-tr-class="tbodyTrClass"
-        :no-local-sorting="true"
-        :sort-direction="sortDirection"
-        :sort-desc.sync="sortDesc"
-        :sort-by.sync="sortBy"
-        sort-icon-left
-        fixed
-        @row-clicked="navigateToAlertDetails"
-        @sort-changed="fetchSortedData"
-      >
-        <template #cell(severity)="{ item }">
-          <div
-            class="d-inline-flex align-items-center justify-content-between"
-            data-testid="severityField"
-          >
-            <gl-icon
-              class="mr-2"
-              :size="12"
-              :name="`severity-${item.severity.toLowerCase()}`"
-              :class="`icon-${item.severity.toLowerCase()}`"
-            />
-            {{ $options.severityLabels[item.severity] }}
-          </div>
-        </template>
+      </template>

-        <template #cell(startedAt)="{ item }">
-          <time-ago v-if="item.startedAt" :time="item.startedAt" />
-        </template>
+      <template #table>
+        <gl-table
+          class="alert-management-table"
+          :items="alerts ? alerts.list : []"
+          :fields="$options.fields"
+          :show-empty="true"
+          :busy="loading"
+          stacked="md"
+          :tbody-tr-class="tbodyTrClass"
+          :no-local-sorting="true"
+          :sort-direction="sortDirection"
+          :sort-desc.sync="sortDesc"
+          :sort-by.sync="sortBy"
+          sort-icon-left
+          fixed
+          @row-clicked="navigateToAlertDetails"
+          @sort-changed="fetchSortedData"
+        >
+          <template #cell(severity)="{ item }">
+            <div
+              class="d-inline-flex align-items-center justify-content-between"
+              data-testid="severityField"
+            >
+              <gl-icon
+                class="mr-2"
+                :size="12"
+                :name="`severity-${item.severity.toLowerCase()}`"
+                :class="`icon-${item.severity.toLowerCase()}`"
+              />
+              {{ $options.severityLabels[item.severity] }}
+            </div>
+          </template>

-        <template #cell(eventCount)="{ item }">
-          {{ item.eventCount }}
-        </template>
+          <template #cell(startedAt)="{ item }">
+            <time-ago v-if="item.startedAt" :time="item.startedAt" />
+          </template>

-        <template #cell(alertLabel)="{ item }">
-          <div
-            class="gl-max-w-full text-truncate"
-            :title="`${item.iid} - ${item.title}`"
-            data-testid="idField"
-          >
-            #{{ item.iid }} {{ item.title }}
-          </div>
-        </template>
+          <template #cell(eventCount)="{ item }">
+            {{ item.eventCount }}
+          </template>

-        <template #cell(issue)="{ item }">
-          <gl-link v-if="item.issueIid" data-testid="issueField" :href="getIssueLink(item)">
-            #{{ item.issueIid }}
-          </gl-link>
-          <div v-else data-testid="issueField">{{ s__('AlertManagement|None') }}</div>
-        </template>
+          <template #cell(alertLabel)="{ item }">
+            <div
+              class="gl-max-w-full text-truncate"
+              :title="`${item.iid} - ${item.title}`"
+              data-testid="idField"
+            >
+              #{{ item.iid }} {{ item.title }}
+            </div>
+          </template>

-        <template #cell(assignees)="{ item }">
-          <div data-testid="assigneesField">
-            <template v-if="hasAssignees(item.assignees)">
-              <gl-avatars-inline
-                :avatars="item.assignees.nodes"
-                :collapsed="true"
-                :max-visible="4"
-                :avatar-size="24"
-                badge-tooltip-prop="name"
-                :badge-tooltip-max-chars="100"
-              >
-                <template #avatar="{ avatar }">
-                  <gl-avatar-link
-                    :key="avatar.username"
-                    v-gl-tooltip
-                    target="_blank"
-                    :href="avatar.webUrl"
-                    :title="avatar.name"
-                  >
-                    <gl-avatar :src="avatar.avatarUrl" :label="avatar.name" :size="24" />
-                  </gl-avatar-link>
-                </template>
-              </gl-avatars-inline>
-            </template>
-            <template v-else>
-              {{ $options.i18n.unassigned }}
-            </template>
-          </div>
-        </template>
+          <template #cell(issue)="{ item }">
+            <gl-link v-if="item.issueIid" data-testid="issueField" :href="getIssueLink(item)">
+              #{{ item.issueIid }}
+            </gl-link>
+            <div v-else data-testid="issueField">{{ s__('AlertManagement|None') }}</div>
+          </template>

-        <template #cell(status)="{ item }">
-          <alert-status
-            :alert="item"
-            :project-path="projectPath"
-            :is-sidebar="false"
-            @alert-error="handleAlertError"
-          />
-        </template>
+          <template #cell(assignees)="{ item }">
+            <div data-testid="assigneesField">
+              <template v-if="hasAssignees(item.assignees)">
+                <gl-avatars-inline
+                  :avatars="item.assignees.nodes"
+                  :collapsed="true"
+                  :max-visible="4"
+                  :avatar-size="24"
+                  badge-tooltip-prop="name"
+                  :badge-tooltip-max-chars="100"
+                >
+                  <template #avatar="{ avatar }">
+                    <gl-avatar-link
+                      :key="avatar.username"
+                      v-gl-tooltip
+                      target="_blank"
+                      :href="avatar.webUrl"
+                      :title="avatar.name"
+                    >
+                      <gl-avatar :src="avatar.avatarUrl" :label="avatar.name" :size="24" />
+                    </gl-avatar-link>
+                  </template>
+                </gl-avatars-inline>
+              </template>
+              <template v-else>
+                {{ $options.i18n.unassigned }}
+              </template>
+            </div>
+          </template>

-        <template #empty>
-          {{ s__('AlertManagement|No alerts to display.') }}
-        </template>
+          <template #cell(status)="{ item }">
+            <alert-status
+              :alert="item"
+              :project-path="projectPath"
+              :is-sidebar="false"
+              @alert-error="handleAlertError"
+              @hide-dropdown="handleStatusUpdate"
+            />
+          </template>

-        <template #table-busy>
-          <gl-loading-icon size="lg" color="dark" class="mt-3" />
-        </template>
-      </gl-table>
+          <template #empty>
+            {{ s__('AlertManagement|No alerts to display.') }}
+          </template>

-      <gl-pagination
-        v-if="showPaginationControls"
-        :value="pagination.currentPage"
-        :prev-page="prevPage"
-        :next-page="nextPage"
-        align="center"
-        class="gl-pagination gl-mt-3"
-        @input="handlePageChange"
-      />
-    </div>
+          <template #table-busy>
+            <gl-loading-icon size="lg" color="dark" class="mt-3" />
+          </template>
+        </gl-table>
+      </template>
+    </paginated-table-with-search-and-tabs>
  </div>
 </template>
--- a/app/assets/javascripts/alert_management/components/alert_metrics.vue
+++ b/app/assets/javascripts/alert_management/components/alert_metrics.vue
 <script>
 import Vue from 'vue';
 import Vuex from 'vuex';
-import * as Sentry from '@sentry/browser';
+import * as Sentry from '~/sentry/wrapper';

 Vue.use(Vuex);


--- a/app/assets/javascripts/alert_management/components/alert_sidebar.vue
+++ b/app/assets/javascripts/alert_management/components/alert_sidebar.vue
@@ -18,7 +18,6 @@ export default {
      default: '',
    },
    projectId: {
-      type: String,
      default: '',
    },
  },

--- a/app/assets/javascripts/alert_management/components/alert_status.vue
+++ b/app/assets/javascripts/alert_management/components/alert_status.vue
 <script>
-import { GlDeprecatedDropdown, GlDeprecatedDropdownItem, GlButton } from '@gitlab/ui';
+import { GlDropdown, GlDropdownItem } from '@gitlab/ui';
 import { s__ } from '~/locale';
 import Tracking from '~/tracking';
 import { trackAlertStatusUpdateOptions } from '../constants';
-import updateAlertStatus from '../graphql/mutations/update_alert_status.mutation.graphql';
+import updateAlertStatusMutation from '../graphql/mutations/update_alert_status.mutation.graphql';

 export default {
  i18n: {
@@ -18,9 +18,8 @@ export default {
    RESOLVED: s__('AlertManagement|Resolved'),
  },
  components: {
-    GlDeprecatedDropdown,
-    GlDeprecatedDropdownItem,
-    GlButton,
+    GlDropdown,
+    GlDropdownItem,
  },
  props: {
    projectPath: {
@@ -51,7 +50,7 @@ export default {
      this.$emit('handle-updating', true);
      this.$apollo
        .mutate({
-          mutation: updateAlertStatus,
+          mutation: updateAlertStatusMutation,
          variables: {
            iid: this.alert.iid,
            status: status.toUpperCase(),
@@ -60,8 +59,6 @@ export default {
        })
        .then(resp => {
          this.trackStatusUpdate(status);
-          this.$emit('hide-dropdown');
-
          const errors = resp.data?.updateAlertStatus?.errors || [];

          if (errors[0]) {
@@ -70,6 +67,8 @@ export default {
              `${this.$options.i18n.UPDATE_ALERT_STATUS_ERROR} ${errors[0]}`,
            );
          }
+
+          this.$emit('hide-dropdown');
        })
        .catch(() => {
          this.$emit(
@@ -91,39 +90,30 @@ export default {

 <template>
  <div class="dropdown dropdown-menu-selectable" :class="dropdownClass">
-    <gl-deprecated-dropdown
+    <gl-dropdown
      ref="dropdown"
      right
      :text="$options.statuses[alert.status]"
      class="w-100"
      toggle-class="dropdown-menu-toggle"
-      variant="outline-default"
      @keydown.esc.native="$emit('hide-dropdown')"
      @hide="$emit('hide-dropdown')"
    >
-      <div v-if="isSidebar" class="dropdown-title gl-display-flex">
-        <span class="alert-title gl-ml-auto">{{ s__('AlertManagement|Assign status') }}</span>
-        <gl-button
-          :aria-label="__('Close')"
-          variant="link"
-          class="dropdown-title-button dropdown-menu-close gl-ml-auto gl-text-black-normal!"
-          icon="close"
-          @click="$emit('hide-dropdown')"
-        />
-      </div>
+      <p v-if="isSidebar" class="gl-new-dropdown-header-top" data-testid="dropdown-header">
+        {{ s__('AlertManagement|Assign status') }}
+      </p>
      <div class="dropdown-content dropdown-body">
-        <gl-deprecated-dropdown-item
+        <gl-dropdown-item
          v-for="(label, field) in $options.statuses"
          :key="field"
          data-testid="statusDropdownItem"
-          class="gl-vertical-align-middle"
          :active="label.toUpperCase() === alert.status"
          :active-class="'is-active'"
          @click="updateAlertStatus(label)"
        >
          {{ label }}
-        </gl-deprecated-dropdown-item>
+        </gl-dropdown-item>
      </div>
-    </gl-deprecated-dropdown>
+    </gl-dropdown>
  </div>
 </template>
No results found