From 66664611361dcfcbaf99cd7c6906b99bcb16becd Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 7 Dec 2022 03:11:02 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../first_array_element_indentation.yml | 25 -- GITALY_SERVER_VERSION | 2 +- .../components/work_item_milestone.vue | 8 +- .../concerns/import/github_oauth.rb | 1 + app/models/postgresql/detached_partition.rb | 4 + .../linear_group_descendants_finder_upto.yml | 2 +- .../development/project_list_filter_bar.yml | 2 +- ...e_traversal_ids_for_descendants_scopes.yml | 2 +- .../development/user_time_settings.yml | 2 +- .../legacy_open_source_license_available.yml | 2 +- config/routes/user.rb | 16 ++ ..._author_id_created_at_on_merge_requests.rb | 15 ++ db/schema_migrations/20221206012013 | 1 + db/structure.sql | 2 + lib/gitlab/database/lock_writes_manager.rb | 22 +- .../database/tables_sorted_by_foreign_keys.rb | 25 +- lib/gitlab/database/tables_truncate.rb | 14 +- lib/tasks/gitlab/db/lock_writes.rake | 5 +- lib/version_check.rb | 8 +- .../database/lock_writes_manager_spec.rb | 8 + .../tables_sorted_by_foreign_keys_spec.rb | 34 ++- .../gitlab/database/tables_truncate_spec.rb | 82 +++++-- .../importer/issues_importer_spec.rb | 10 +- spec/lib/gitlab/search/found_blob_spec.rb | 5 +- spec/lib/version_check_spec.rb | 41 ++-- spec/models/ci/runner_version_spec.rb | 8 +- spec/models/repository_spec.rb | 54 ++--- .../api/task_completion_status_spec.rb | 70 +++--- spec/routing/user_routing_spec.rb | 29 +++ .../security/merge_reports_service_spec.rb | 26 +-- spec/simplecov_env.rb | 14 +- .../atlassian/jira_connect/schemata.rb | 2 +- spec/support/capybara.rb | 20 +- spec/support/finder_collection_allowlist.yml | 4 +- .../helpers/project_template_test_helper.rb | 16 +- spec/support/helpers/test_env.rb | 14 +- spec/support/helpers/usage_data_helpers.rb | 220 +++++++++--------- spec/support/matchers/exceed_query_limit.rb | 14 +- .../vulnerabilities_findings_helper.rb | 8 +- .../additional_metrics_shared_examples.rb | 6 +- .../policies/group_policy_shared_context.rb | 38 +-- .../shared_examples/graphql/label_fields.rb | 4 +- .../middleware/multipart_shared_examples.rb | 42 ++-- ...epository_storage_moves_shared_examples.rb | 6 +- spec/tasks/gitlab/db/lock_writes_rake_spec.rb | 46 ++++ .../_related_branches.html.haml_spec.rb | 11 +- tooling/lib/tooling/helm3_client.rb | 5 +- 47 files changed, 616 insertions(+), 379 deletions(-) delete mode 100644 .rubocop_todo/layout/first_array_element_indentation.yml create mode 100644 db/post_migrate/20221206012013_add_index_author_id_created_at_on_merge_requests.rb create mode 100644 db/schema_migrations/20221206012013 create mode 100644 spec/routing/user_routing_spec.rb diff --git a/.rubocop_todo/layout/first_array_element_indentation.yml b/.rubocop_todo/layout/first_array_element_indentation.yml deleted file mode 100644 index d4c332476ad..00000000000 --- a/.rubocop_todo/layout/first_array_element_indentation.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -# Cop supports --autocorrect. -Layout/FirstArrayElementIndentation: - Exclude: - - 'spec/lib/gitlab/github_import/importer/issues_importer_spec.rb' - - 'spec/lib/gitlab/search/found_blob_spec.rb' - - 'spec/models/ci/runner_version_spec.rb' - - 'spec/models/repository_spec.rb' - - 'spec/requests/api/task_completion_status_spec.rb' - - 'spec/services/security/merge_reports_service_spec.rb' - - 'spec/simplecov_env.rb' - - 'spec/support/atlassian/jira_connect/schemata.rb' - - 'spec/support/capybara.rb' - - 'spec/support/helpers/project_template_test_helper.rb' - - 'spec/support/helpers/test_env.rb' - - 'spec/support/helpers/usage_data_helpers.rb' - - 'spec/support/matchers/exceed_query_limit.rb' - - 'spec/support/migrations_helpers/vulnerabilities_findings_helper.rb' - - 'spec/support/prometheus/additional_metrics_shared_examples.rb' - - 'spec/support/shared_contexts/policies/group_policy_shared_context.rb' - - 'spec/support/shared_examples/graphql/label_fields.rb' - - 'spec/support/shared_examples/lib/gitlab/middleware/multipart_shared_examples.rb' - - 'spec/support/shared_examples/requests/api/repository_storage_moves_shared_examples.rb' - - 'spec/views/projects/issues/_related_branches.html.haml_spec.rb' - - 'tooling/lib/tooling/helm3_client.rb' diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 0cac7ba6c87..6235a55bd86 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -22722e29aa21a554ed1e729f9b23a485929ac4cf +434051eb74b0043267538213192a790095caf671 diff --git a/app/assets/javascripts/work_items/components/work_item_milestone.vue b/app/assets/javascripts/work_items/components/work_item_milestone.vue index a8d3b57aae0..6a6d8d210e8 100644 --- a/app/assets/javascripts/work_items/components/work_item_milestone.vue +++ b/app/assets/javascripts/work_items/components/work_item_milestone.vue @@ -118,6 +118,7 @@ export default { return { 'gl-text-gray-500!': this.canUpdate && this.isNoMilestone, 'is-not-focused': !this.isFocused, + 'gl-min-w-20': true, }; }, }, @@ -214,9 +215,10 @@ export default {