From 91c2554bcf93c3c41aa830da4dd7a2d4b7483e2d Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 17 May 2022 09:08:20 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../background_migration_base_class.yml | 1 + GITLAB_SHELL_VERSION | 2 +- .../pipelines_list/pipeline_mini_graph.vue | 2 +- .../pipelines_list/pipelines_table.vue | 2 +- .../commit_box_pipeline_mini_graph.vue | 2 +- .../mr_widget_options.vue | 2 +- .../initializers/content_security_policy.rb | 2 - .../15_0/15-0-removal-artifacts-keyword.yml | 11 +++-- ...add_notes_null_discussion_id_temp_index.rb | 16 +++++++ ...61450_backfill_null_note_discussion_ids.rb | 31 ++++++++++++ db/schema_migrations/20220420061439 | 1 + db/schema_migrations/20220420061450 | 1 + db/structure.sql | 2 + .../img/request_profile_result.png | Bin 11451 -> 0 bytes doc/api/personal_access_tokens.md | 11 +++-- doc/ci/pipelines/settings.md | 21 +++++++-- doc/policy/maintenance.md | 3 +- doc/update/removals.md | 7 +-- .../policies/img/policies_list_v15_0.png | Bin 75954 -> 29041 bytes .../clusters/img/applications_tab_v13_12.png | Bin 79656 -> 0 bytes .../img/add_internal_note_v15_0.png | Bin 66042 -> 18963 bytes .../project/issues/confidential_issues.md | 2 +- .../issues/img/turn_off_confidentiality.png | Bin 28579 -> 0 bytes .../img/turn_off_confidentiality_v15_0.png | Bin 0 -> 10137 bytes ....png => turn_on_confidentiality_v15_0.png} | Bin .../backfill_note_discussion_id.rb | 44 ++++++++++++++++++ .../Jobs/Secret-Detection.gitlab-ci.yml | 35 +------------- .../content_security_policy/config_loader.rb | 9 ++-- .../backfill_note_discussion_id_spec.rb | 29 ++++++++++++ .../config_loader_spec.rb | 20 ++++++++ spec/lib/gitlab/saas_spec.rb | 6 +-- spec/support/helpers/saas_test_helper.rb | 9 ++++ 32 files changed, 206 insertions(+), 65 deletions(-) create mode 100644 db/post_migrate/20220420061439_add_notes_null_discussion_id_temp_index.rb create mode 100644 db/post_migrate/20220420061450_backfill_null_note_discussion_ids.rb create mode 100644 db/schema_migrations/20220420061439 create mode 100644 db/schema_migrations/20220420061450 delete mode 100644 doc/administration/monitoring/performance/img/request_profile_result.png delete mode 100644 doc/user/clusters/img/applications_tab_v13_12.png delete mode 100644 doc/user/project/issues/img/turn_off_confidentiality.png create mode 100644 doc/user/project/issues/img/turn_off_confidentiality_v15_0.png rename doc/user/project/issues/img/{turn_on_confidentiality.png => turn_on_confidentiality_v15_0.png} (100%) create mode 100644 lib/gitlab/background_migration/backfill_note_discussion_id.rb create mode 100644 spec/lib/gitlab/background_migration/backfill_note_discussion_id_spec.rb create mode 100644 spec/support/helpers/saas_test_helper.rb diff --git a/.rubocop_todo/migration/background_migration_base_class.yml b/.rubocop_todo/migration/background_migration_base_class.yml index 8d7d8e954e3..f026ec19c7b 100644 --- a/.rubocop_todo/migration/background_migration_base_class.yml +++ b/.rubocop_todo/migration/background_migration_base_class.yml @@ -15,6 +15,7 @@ Migration/BackgroundMigrationBaseClass: - 'lib/gitlab/background_migration/backfill_namespace_id_for_project_route.rb' - 'lib/gitlab/background_migration/backfill_namespace_traversal_ids_children.rb' - 'lib/gitlab/background_migration/backfill_namespace_traversal_ids_roots.rb' + - 'lib/gitlab/background_migration/backfill_note_discussion_id.rb' - 'lib/gitlab/background_migration/backfill_projects_with_coverage.rb' - 'lib/gitlab/background_migration/backfill_project_repositories.rb' - 'lib/gitlab/background_migration/backfill_project_settings.rb' diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION index 07ea9fa4381..32f02f10ebe 100644 --- a/GITLAB_SHELL_VERSION +++ b/GITLAB_SHELL_VERSION @@ -1 +1 @@ -14.2.0 +14.3.0 diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_mini_graph.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_mini_graph.vue index 6ed9d8d4dc9..e35fccf2d7e 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_mini_graph.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipeline_mini_graph.vue @@ -36,7 +36,7 @@ export default { };