From a3764262c04bafcd6a54aff635541d73a8a630fd Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 20 Oct 2022 18:09:10 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .gitlab-ci.yml | 2 +- .rubocop_todo/gitlab/json.yml | 6 +- .rubocop_todo/layout/line_length.yml | 2 - .rubocop_todo/style/if_unless_modifier.yml | 2 - Gemfile | 2 +- Gemfile.checksum | 4 +- Gemfile.lock | 6 +- .../issuable/components/related_issuable_item.vue | 1 + .../components/pipeline_schedules.vue | 106 +++++++++++++- .../components/table/pipeline_schedules_table.vue | 6 + .../queries/get_pipeline_schedules.query.graphql | 5 +- .../jira_connect/subscriptions_controller.rb | 2 +- app/models/namespace.rb | 6 +- app/models/personal_access_token.rb | 33 ----- .../admin/application_settings/general.html.haml | 2 +- .../ci/variables/_url_query_variable_row.html.haml | 28 ---- .../access_tokens/_created_container.html.haml | 12 -- app/views/shared/access_tokens/_table.html.haml | 51 ------- .../jira_connect_oauth_self_managed_setting.yml | 8 + db/docs/software_license_policies.yml | 2 +- db/docs/software_licenses.yml | 2 +- ...te_transitions_with_same_from_state_to_state.rb | 19 +++ db/schema_migrations/20221013215832 | 1 + doc/api/remote_mirrors.md | 31 ++-- .../blueprints/ci_pipeline_components/index.md | 13 +- doc/ci/pipelines/downstream_pipelines.md | 5 +- doc/ci/testing/unit_test_report_examples.md | 3 + doc/development/sidekiq/worker_attributes.md | 2 +- lib/api/integrations/jira_connect/subscriptions.rb | 2 +- lib/gitlab/ci/variables/collection.rb | 3 +- .../index_helpers.rb | 50 +++++++ lib/tasks/gitlab/gitaly.rake | 2 +- lib/tasks/gitlab/tw/codeowners.rake | 4 +- locale/gitlab.pot | 18 +-- qa/qa/page/component/access_tokens.rb | 8 - .../api/1_manage/project_access_token_spec.rb | 8 +- spec/features/issues/user_sorts_issues_spec.rb | 2 +- .../components/pipeline_schedules_spec.js | 50 ++++++- spec/lib/gitlab/ci/variables/collection_spec.rb | 3 +- .../index_helpers_spec.rb | 161 +++++++++++++++++++++ ...ansitions_with_same_from_state_to_state_spec.rb | 49 +++++++ spec/models/namespace_spec.rb | 6 +- spec/models/personal_access_token_spec.rb | 55 +------ spec/presenters/ci/build_runner_presenter_spec.rb | 3 +- .../jira_connect/subscriptions_spec.rb | 2 +- .../jira_connect/subscriptions_controller_spec.rb | 4 +- spec/support/rspec_order_todo.yml | 2 - spec/tasks/gitlab/gitaly_rake_spec.rb | 8 +- .../application_settings/general.html.haml_spec.rb | 4 +- .../shared/access_tokens/_table.html.haml_spec.rb | 151 ------------------- 50 files changed, 517 insertions(+), 440 deletions(-) delete mode 100644 app/views/ci/variables/_url_query_variable_row.html.haml delete mode 100644 app/views/shared/access_tokens/_created_container.html.haml delete mode 100644 app/views/shared/access_tokens/_table.html.haml create mode 100644 config/feature_flags/development/jira_connect_oauth_self_managed_setting.yml create mode 100644 db/post_migrate/20221013215832_cleanup_vulnerability_state_transitions_with_same_from_state_to_state.rb create mode 100644 db/schema_migrations/20221013215832 create mode 100644 spec/migrations/cleanup_vulnerability_state_transitions_with_same_from_state_to_state_spec.rb delete mode 100644 spec/views/shared/access_tokens/_table.html.haml_spec.rb diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 689c05f4874..3d2f32a0390 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,7 +127,7 @@ variables: # Run with decomposed databases by default DECOMPOSED_DB: "true" - DOCS_REVIEW_APPS_DOMAIN: "35.193.151.162.nip.io" + DOCS_REVIEW_APPS_DOMAIN: "docs.gitlab-review-app" DOCS_GITLAB_REPO_SUFFIX: "ee" REVIEW_APPS_IMAGE: "${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/ruby-3.0:gcloud-383-kubectl-1.23-helm-3.5" diff --git a/.rubocop_todo/gitlab/json.yml b/.rubocop_todo/gitlab/json.yml index 9a946f11f84..ec48c04f3ed 100644 --- a/.rubocop_todo/gitlab/json.yml +++ b/.rubocop_todo/gitlab/json.yml @@ -1,5 +1,5 @@ --- -# Cop supports --auto-correct. +# Cop supports --autocorrect. Gitlab/Json: Details: grace period Exclude: @@ -247,6 +247,7 @@ Gitlab/Json: - 'lib/gitlab/database/background_migration/batched_migration.rb' - 'lib/gitlab/database/background_migration_job.rb' - 'lib/gitlab/database/migration_helpers.rb' + - 'lib/gitlab/database/migrations/batched_background_migration_helpers.rb' - 'lib/gitlab/database/migrations/instrumentation.rb' - 'lib/gitlab/database/migrations/runner.rb' - 'lib/gitlab/database/postgres_hll/buckets.rb' @@ -284,6 +285,7 @@ Gitlab/Json: - 'lib/microsoft_teams/notifier.rb' - 'lib/tasks/gitlab/background_migrations.rake' - 'lib/version_check.rb' + - 'spec/commands/diagnostic_reports/uploader_smoke_spec.rb' - 'spec/controllers/admin/integrations_controller_spec.rb' - 'spec/controllers/concerns/product_analytics_tracking_spec.rb' - 'spec/controllers/groups/settings/integrations_controller_spec.rb' @@ -417,7 +419,9 @@ Gitlab/Json: - 'spec/requests/api/merge_requests_spec.rb' - 'spec/requests/api/namespaces_spec.rb' - 'spec/requests/api/project_snapshots_spec.rb' + - 'spec/requests/groups/settings/access_tokens_controller_spec.rb' - 'spec/requests/projects/incident_management/pagerduty_incidents_spec.rb' + - 'spec/requests/projects/settings/access_tokens_controller_spec.rb' - 'spec/requests/users_controller_spec.rb' - 'spec/requests/whats_new_controller_spec.rb' - 'spec/scripts/pipeline_test_report_builder_spec.rb' diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml index fe9c0593f7d..eaa8e6485be 100644 --- a/.rubocop_todo/layout/line_length.yml +++ b/.rubocop_todo/layout/line_length.yml @@ -2855,7 +2855,6 @@ Layout/LineLength: - 'ee/spec/views/registrations/welcome/show.html.haml_spec.rb' - 'ee/spec/views/shared/_mirror_status.html.haml_spec.rb' - 'ee/spec/views/shared/_namespace_user_cap_reached_alert.html.haml_spec.rb' - - 'ee/spec/views/shared/access_tokens/_table.html.haml_spec.rb' - 'ee/spec/views/shared/billings/_eoa_bronze_plan_banner.html.haml_spec.rb' - 'ee/spec/views/shared/billings/_trial_status.html.haml_spec.rb' - 'ee/spec/views/shared/credentials_inventory/personal_access_tokens/_personal_access_token.html.haml_spec.rb' @@ -5968,7 +5967,6 @@ Layout/LineLength: - 'spec/views/projects/tags/index.html.haml_spec.rb' - 'spec/views/projects/tree/show.html.haml_spec.rb' - 'spec/views/search/_results.html.haml_spec.rb' - - 'spec/views/shared/access_tokens/_table.html.haml_spec.rb' - 'spec/views/shared/milestones/_issuable.html.haml_spec.rb' - 'spec/views/shared/projects/_project.html.haml_spec.rb' - 'spec/views/shared/snippets/_snippet.html.haml_spec.rb' diff --git a/.rubocop_todo/style/if_unless_modifier.yml b/.rubocop_todo/style/if_unless_modifier.yml index 8e295c68623..16d163ebdfc 100644 --- a/.rubocop_todo/style/if_unless_modifier.yml +++ b/.rubocop_todo/style/if_unless_modifier.yml @@ -743,7 +743,6 @@ Style/IfUnlessModifier: - 'ee/spec/support/http_io/http_io_helpers.rb' - 'ee/spec/support/shared_examples/requests/api/graphql/geo/registries_shared_examples.rb' - 'ee/spec/views/layouts/header/help_dropdown/_cross_stage_fdm.html.haml_spec.rb' - - 'ee/spec/views/shared/access_tokens/_table.html.haml_spec.rb' - 'ee/spec/workers/elastic/migration_worker_spec.rb' - 'lib/api/api_guard.rb' - 'lib/api/boards_responses.rb' @@ -1202,7 +1201,6 @@ Style/IfUnlessModifier: - 'spec/views/groups/edit.html.haml_spec.rb' - 'spec/views/profiles/keys/_key.html.haml_spec.rb' - 'spec/views/projects/edit.html.haml_spec.rb' - - 'spec/views/shared/access_tokens/_table.html.haml_spec.rb' - 'spec/workers/analytics/usage_trends/counter_job_worker_spec.rb' - 'tooling/danger/product_intelligence.rb' - 'tooling/lib/tooling/find_codeowners.rb' diff --git a/Gemfile b/Gemfile index 3cd30bb4599..ad032aa0119 100644 --- a/Gemfile +++ b/Gemfile @@ -428,7 +428,7 @@ group :development, :test do end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.5.2', require: false + gem 'gitlab-dangerfiles', '~> 3.6.1', require: false end group :development, :test, :coverage do diff --git a/Gemfile.checksum b/Gemfile.checksum index c145415591b..74500a24d73 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -151,7 +151,7 @@ {"name":"faraday-em_http","version":"1.0.0","platform":"ruby","checksum":"7a3d4c7079789121054f57e08cd4ef7e40ad1549b63101f38c7093a9d6c59689"}, {"name":"faraday-em_synchrony","version":"1.0.0","platform":"ruby","checksum":"460dad1c30cc692d6e77d4c391ccadb4eca4854b315632cd7e560f74275cf9ed"}, {"name":"faraday-excon","version":"1.1.0","platform":"ruby","checksum":"b055c842376734d7f74350fe8611542ae2000c5387348d9ba9708109d6e40940"}, -{"name":"faraday-http-cache","version":"2.4.0","platform":"ruby","checksum":"388f901d63bd5903b470c5696bc886ed94fab0c4206b25c3761e7b9bdbbf6c90"}, +{"name":"faraday-http-cache","version":"2.4.1","platform":"ruby","checksum":"fb51b2e9ee72f89e81cc277ee574dbc5940f3db95431b3533de9882f92635ee3"}, {"name":"faraday-httpclient","version":"1.0.1","platform":"ruby","checksum":"4c8ff1f0973ff835be8d043ef16aaf54f47f25b7578f6d916deee8399a04d33b"}, {"name":"faraday-multipart","version":"1.0.4","platform":"ruby","checksum":"9012021ab57790f7d712f590b48d5f948b19b43cfa11ca83e6459f06090b0725"}, {"name":"faraday-net_http","version":"1.0.1","platform":"ruby","checksum":"3245ce406ebb77b40e17a77bfa66191dda04be2fd4e13a78d8a4305854d328ba"}, @@ -202,7 +202,7 @@ {"name":"github-markup","version":"1.7.0","platform":"ruby","checksum":"97eb27c70662d9cc1d5997cd6c99832026fae5d4913b5dce1ce6c9f65078e69d"}, {"name":"gitlab","version":"4.16.1","platform":"ruby","checksum":"13fd7059cbdad5a1a21b15fa2cf9070b97d92e27f8c688581fe3d84dc038074f"}, {"name":"gitlab-chronic","version":"0.10.5","platform":"ruby","checksum":"f80f18dc699b708870a80685243331290bc10cfeedb6b99c92219722f729c875"}, -{"name":"gitlab-dangerfiles","version":"3.5.2","platform":"ruby","checksum":"fae28a55b83b6c7f8298b9b1d90354ae73636729fd829ad58326bef46bd2f01f"}, +{"name":"gitlab-dangerfiles","version":"3.6.1","platform":"ruby","checksum":"f7b69b093d52acb89095d411cb7b8849f5f3b9e76f8baa4c99b5671f1564865f"}, {"name":"gitlab-experiment","version":"0.7.1","platform":"ruby","checksum":"166dddb3aa83428bcaa93c35684ed01dc4d61f321fd2ae40b020806dc54a7824"}, {"name":"gitlab-fog-azure-rm","version":"1.3.0","platform":"ruby","checksum":"2fef5317d6515f95f803099afa860fe3019ce6e1907bf49f66b5e06468a617b5"}, {"name":"gitlab-labkit","version":"0.24.0","platform":"ruby","checksum":"8f16e5aa4e0a05be58958fe880bdd53c84b659a081ea9981d2b510922a4a0548"}, diff --git a/Gemfile.lock b/Gemfile.lock index d2b6d367ae4..8d2b983cf00 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -448,7 +448,7 @@ GEM faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) - faraday-http-cache (2.4.0) + faraday-http-cache (2.4.1) faraday (>= 0.8) faraday-httpclient (1.0.1) faraday-multipart (1.0.4) @@ -555,7 +555,7 @@ GEM terminal-table (~> 1.5, >= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (3.5.2) + gitlab-dangerfiles (3.6.1) danger (>= 8.4.5) danger-gitlab (>= 8.0.0) rake @@ -1627,7 +1627,7 @@ DEPENDENCIES gitaly (~> 15.4.0.pre.rc2) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 3.5.2) + gitlab-dangerfiles (~> 3.6.1) gitlab-experiment (~> 0.7.1) gitlab-fog-azure-rm (~> 1.3.0) gitlab-labkit (~> 0.24.0) diff --git a/app/assets/javascripts/issuable/components/related_issuable_item.vue b/app/assets/javascripts/issuable/components/related_issuable_item.vue index 8894e8f63b8..254248ef1d4 100644 --- a/app/assets/javascripts/issuable/components/related_issuable_item.vue +++ b/app/assets/javascripts/issuable/components/related_issuable_item.vue @@ -141,6 +141,7 @@ export default { {{ title }} diff --git a/app/assets/javascripts/pipeline_schedules/components/pipeline_schedules.vue b/app/assets/javascripts/pipeline_schedules/components/pipeline_schedules.vue index 4a08a82275a..b055b89c528 100644 --- a/app/assets/javascripts/pipeline_schedules/components/pipeline_schedules.vue +++ b/app/assets/javascripts/pipeline_schedules/components/pipeline_schedules.vue @@ -1,6 +1,8 @@ @@ -110,12 +167,45 @@ export default { {{ errorMessage }} - +