From 4dc620034e192cdfb4dab5908a2f406e37e76b68 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 13 Jan 2022 00:16:12 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../components/states/mr_widget_rebase.vue | 49 +++++-- .../vue_merge_request_widget/constants.js | 3 + .../services/mr_widget_service.js | 5 +- app/models/clusters/applications/runner.rb | 4 +- app/services/ci/destroy_pipeline_service.rb | 4 +- .../15-0-deprecate-monitor-tracing.yml | 16 +++ ...52_index_cluster_agent_tokens_on_status.rb | 15 ++ ...lete_from_project_namespace_foreign_key.rb | 23 +++ db/schema_migrations/20220111023852 | 1 + db/schema_migrations/20220112090556 | 1 + db/structure.sql | 4 +- doc/administration/pages/index.md | 9 ++ doc/ci/ci_cd_for_external_repos/index.md | 4 - doc/ci/pipelines/merge_trains.md | 4 - .../pipelines/pipelines_for_merged_results.md | 4 - doc/ci/test_cases/index.md | 4 - doc/development/internal_api/index.md | 26 ++++ doc/push_rules/push_rules.md | 4 - doc/subscriptions/index.md | 5 - doc/update/deprecations.md | 6 + .../application_security/api_fuzzing/index.md | 4 - .../container_scanning/index.md | 4 - doc/user/application_security/dast/index.md | 4 - .../dependency_scanning/index.md | 4 - doc/user/application_security/index.md | 4 - .../security_dashboard/index.md | 4 - .../vulnerabilities/index.md | 2 +- doc/user/clusters/agent/index.md | 4 - .../compliance/license_compliance/index.md | 4 - doc/user/group/epics/epic_boards.md | 4 - doc/user/group/epics/index.md | 4 - doc/user/group/saml_sso/index.md | 4 - doc/user/project/code_owners.md | 4 - .../merge_requests/fast_forward_merge.md | 5 +- .../merge_requests/img/ff_merge_rebase.png | Bin 26945 -> 0 bytes .../img/ff_merge_rebase_v14_7.png | Bin 0 -> 13865 bytes doc/user/project/requirements/index.md | 4 - doc/user/search/advanced_search.md | 4 - locale/gitlab.pot | 15 ++ spec/factories/clusters/applications/helm.rb | 1 - .../components/mr_widget_rebase_spec.js | 134 ++++++++++++------ .../gitlab/ci/pipeline/chain/create_spec.rb | 4 +- spec/models/ci/build_trace_chunk_spec.rb | 24 +++- .../namespaces/project_namespace_spec.rb | 4 +- spec/requests/api/commits_spec.rb | 8 +- spec/services/ci/retry_build_service_spec.rb | 8 ++ .../cross-database-modification-allowlist.yml | 11 +- ...date_project_statistics_shared_examples.rb | 6 +- 48 files changed, 291 insertions(+), 178 deletions(-) create mode 100644 data/deprecations/15-0-deprecate-monitor-tracing.yml create mode 100644 db/post_migrate/20220111023852_index_cluster_agent_tokens_on_status.rb create mode 100644 db/post_migrate/20220112090556_remove_cascade_delete_from_project_namespace_foreign_key.rb create mode 100644 db/schema_migrations/20220111023852 create mode 100644 db/schema_migrations/20220112090556 delete mode 100644 doc/user/project/merge_requests/img/ff_merge_rebase.png create mode 100644 doc/user/project/merge_requests/img/ff_merge_rebase_v14_7.png diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue index 886fab8634c..c44d14f08b6 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue @@ -1,13 +1,15 @@