From d4a7d0bec23c624bd0e7d690bdc0cb3fe8387378 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 13 Jun 2022 18:09:22 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- Gemfile | 4 +- Gemfile.lock | 10 +- .../components/access_token_table_app.vue | 6 +- .../access_tokens/components/constants.js | 2 +- .../components/new_access_token_app.vue | 8 +- .../components/toolbar/design_navigation.vue | 4 +- .../pipelines/charts/components/app.vue | 9 ++ .../mr_widget_options.vue | 2 +- .../concerns/sensitive_serializable_hash.rb | 2 +- .../admin/application_settings/_eks.html.haml | 2 +- ...ernal_authorization_service_form.html.haml | 4 +- .../application_settings/_floc.html.haml | 2 +- .../application_settings/_gitpod.html.haml | 2 +- .../_jira_connect_application_key.html.haml | 2 +- .../application_settings/_kroki.html.haml | 2 +- .../application_settings/_mailgun.html.haml | 2 +- .../_package_registry.html.haml | 2 +- .../application_settings/_plantuml.html.haml | 2 +- .../application_settings/_snowplow.html.haml | 2 +- .../_sourcegraph.html.haml | 2 +- .../_third_party_offers.html.haml | 2 +- .../application_settings/ci/_header.html.haml | 2 +- .../application_settings/ci_cd.html.haml | 6 +- .../application_settings/general.html.haml | 14 +-- .../metrics_and_profiling.html.haml | 10 +- .../application_settings/network.html.haml | 28 ++--- .../preferences.html.haml | 16 +-- .../application_settings/reporting.html.haml | 4 +- .../application_settings/repository.html.haml | 10 +- app/views/admin/hooks/_form.html.haml | 2 +- app/views/admin/projects/index.html.haml | 1 - app/views/admin/users/_head.html.haml | 2 +- .../pipeline_schedules/_form.html.haml | 2 +- .../cascading_settings/_lock_icon.html.haml | 5 +- doc/api/bulk_imports.md | 8 +- doc/ci/yaml/index.md | 2 +- doc/user/analytics/ci_cd_analytics.md | 22 ++++ .../time_to_restore_service_charts_v15_1.png | Bin 0 -> 86137 bytes doc/user/analytics/index.md | 6 + doc/user/clusters/agent/vulnerabilities.md | 2 - .../clusters/connect/new_gke_cluster.md | 3 +- doc/user/project/releases/index.md | 103 +++++++----------- lib/api/bulk_imports.rb | 2 +- locale/gitlab.pot | 6 + .../components/new_access_token_app_spec.js | 2 +- .../design_navigation_spec.js.snap | 4 +- .../pipelines/charts/components/app_spec.js | 30 +++-- .../vue_mr_widget/mr_widget_options_spec.js | 16 ++- .../sensitive_serializable_hash_spec.rb | 17 ++- spec/requests/api/bulk_imports_spec.rb | 4 +- 50 files changed, 222 insertions(+), 180 deletions(-) create mode 100644 doc/user/analytics/img/time_to_restore_service_charts_v15_1.png diff --git a/Gemfile b/Gemfile index a990feb2ea7..a42490719b7 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem 'view_component', '~> 2.50.0' gem 'default_value_for', '~> 3.4.0' # Supported DBs -gem 'pg', '~> 1.1' +gem 'pg', '~> 1.3.0' gem 'rugged', '~> 1.2' gem 'grape-path-helpers', '~> 1.7.0' @@ -311,7 +311,7 @@ gem 'sentry-sidekiq', '~> 5.1.1' # PostgreSQL query parsing # -gem 'pg_query', '~> 2.1' +gem 'pg_query', '~> 2.1.0' gem 'premailer-rails', '~> 1.10.3' diff --git a/Gemfile.lock b/Gemfile.lock index d21c8de0f2a..0db64ebc911 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -947,9 +947,9 @@ GEM tty-color (~> 0.5) peek (1.1.0) railties (>= 4.0.0) - pg (1.2.3) - pg_query (2.1.1) - google-protobuf (>= 3.17.1) + pg (1.3.5) + pg_query (2.1.3) + google-protobuf (>= 3.19.2) plist (3.6.0) png_quantizator (0.2.1) po_to_json (1.0.1) @@ -1630,8 +1630,8 @@ DEPENDENCIES parallel (~> 1.19) parslet (~> 1.8) peek (~> 1.1) - pg (~> 1.1) - pg_query (~> 2.1) + pg (~> 1.3.0) + pg_query (~> 2.1.0) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) prometheus-client-mmap (~> 0.15.0) diff --git a/app/assets/javascripts/access_tokens/components/access_token_table_app.vue b/app/assets/javascripts/access_tokens/components/access_token_table_app.vue index 5fe285c0896..944a2ef7f64 100644 --- a/app/assets/javascripts/access_tokens/components/access_token_table_app.vue +++ b/app/assets/javascripts/access_tokens/components/access_token_table_app.vue @@ -10,6 +10,7 @@ import { EVENT_SUCCESS, FIELDS, FORM_SELECTOR, INITIAL_PAGE, PAGE_SIZE } from '. export default { EVENT_SUCCESS, + FORM_SELECTOR, PAGE_SIZE, name: 'AccessTokenTableApp', components: { @@ -55,9 +56,6 @@ export default { filteredFields() { return this.showRole ? FIELDS : FIELDS.filter((field) => field.key !== 'role'); }, - formSelector() { - return `#${FORM_SELECTOR}`; - }, header() { return sprintf(this.$options.i18n.header, { accessTokenTypePlural: this.accessTokenTypePlural, @@ -97,7 +95,7 @@ export default {