root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2023-09-04 21:07:08 +00:00
parent 6c620180ad
commit f796768612
18 changed files with 3 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.rubocop_todo/gitlab/namespaced_class.yml
View File

@ -989,8 +989,6 @@ Gitlab/NamespacedClass:
- 'ee/app/serializers/epic_note_serializer.rb'
- 'ee/app/serializers/epic_serializer.rb'
- 'ee/app/serializers/file_lock_entity.rb'
- 'ee/app/serializers/geo_design_registry_entity.rb'
- 'ee/app/serializers/geo_design_registry_serializer.rb'
- 'ee/app/serializers/geo_node_serializer.rb'
- 'ee/app/serializers/geo_node_status_serializer.rb'
- 'ee/app/serializers/geo_project_registry_entity.rb'

1
.rubocop_todo/layout/empty_line_after_magic_comment.yml
View File

@ -290,7 +290,6 @@ Layout/EmptyLineAfterMagicComment:
- 'ee/spec/features/projects/settings/merge_request_approvals_settings_spec.rb'
- 'ee/spec/features/projects/settings/merge_requests_settings_spec.rb'
- 'ee/spec/finders/auth/group_saml_identity_finder_spec.rb'
- 'ee/spec/finders/geo/design_registry_finder_spec.rb'
- 'ee/spec/finders/geo/project_registry_status_finder_spec.rb'
- 'ee/spec/frontend/fixtures/analytics/charts.rb'
- 'ee/spec/frontend/fixtures/analytics/metrics.rb'

2
.rubocop_todo/rails/time_zone.yml
View File

@ -5,13 +5,11 @@ Rails/TimeZone:
- 'ee/lib/delay.rb'
- 'ee/lib/gitlab/elastic/indexer.rb'
- 'ee/lib/gitlab/geo/event_gap_tracking.rb'
- 'ee/lib/gitlab/geo/log_cursor/events/design_repository_updated_event.rb'
- 'ee/lib/gitlab/geo/log_cursor/events/repository_updated_event.rb'
- 'ee/lib/gitlab/geo/log_cursor/logger.rb'
- 'ee/lib/gitlab/geo/oauth/login_state.rb'
- 'ee/spec/lib/gitlab/geo/base_request_spec.rb'
- 'ee/spec/lib/gitlab/geo/log_cursor/events/cache_invalidation_event_spec.rb'
- 'ee/spec/lib/gitlab/geo/log_cursor/events/design_repository_updated_event_spec.rb'
- 'ee/spec/lib/gitlab/geo/log_cursor/events/event_spec.rb'
- 'ee/spec/lib/gitlab/geo/log_cursor/events/hashed_storage_attachments_event_spec.rb'
- 'ee/spec/lib/gitlab/geo/log_cursor/events/hashed_storage_migrated_event_spec.rb'

1
.rubocop_todo/rspec/context_wording.yml
View File

@ -460,7 +460,6 @@ RSpec/ContextWording:
- 'ee/spec/models/epic_issue_spec.rb'
- 'ee/spec/models/epic_spec.rb'
- 'ee/spec/models/geo/container_repository_registry_spec.rb'
- 'ee/spec/models/geo/design_registry_spec.rb'
- 'ee/spec/models/geo/project_registry_spec.rb'
- 'ee/spec/models/geo/secondary_usage_data_spec.rb'
- 'ee/spec/models/geo_node_spec.rb'

1
.rubocop_todo/rspec/factory_bot/strategy_in_callback.yml
View File

@ -7,7 +7,6 @@ RSpec/FactoryBot/StrategyInCallback:
- 'ee/spec/factories/description_version.rb'
- 'ee/spec/factories/elastic/reindexing_tasks.rb'
- 'ee/spec/factories/epic_issues.rb'
- 'ee/spec/factories/geo/design_registry.rb'
- 'ee/spec/factories/geo_nodes.rb'
- 'ee/spec/factories/groups.rb'
- 'ee/spec/factories/merge_requests.rb'

1
.rubocop_todo/style/class_and_module_children.yml
View File

@ -459,7 +459,6 @@ Style/ClassAndModuleChildren:
- 'ee/app/models/geo/base_registry.rb'
- 'ee/app/models/geo/container_repository_registry.rb'
- 'ee/app/models/geo/deleted_project.rb'
- 'ee/app/models/geo/design_registry.rb'
- 'ee/app/models/geo/event_log_state.rb'
- 'ee/app/models/geo/group_wiki_repository_registry.rb'
- 'ee/app/models/geo/job_artifact_registry.rb'

1
.rubocop_todo/style/hash_as_last_array_item.yml
View File

@ -39,7 +39,6 @@ Style/HashAsLastArrayItem:
- 'ee/app/serializers/dashboard_environments_serializer.rb'
- 'ee/spec/finders/projects/integrations/jira/by_ids_finder_spec.rb'
- 'ee/spec/lib/ee/gitlab/ci/config/entry/needs_spec.rb'
- 'ee/spec/lib/gitlab/geo/log_cursor/events/design_repository_updated_event_spec.rb'
- 'ee/spec/models/ee/ci/job_artifact_spec.rb'
- 'lib/api/entities/project.rb'
- 'lib/gitlab/analytics/cycle_analytics/request_params.rb'

1
.rubocop_todo/style/redundant_self.yml
View File

@ -205,7 +205,6 @@ Style/RedundantSelf:
- 'ee/app/models/ee/user.rb'
- 'ee/app/models/epic/metrics.rb'
- 'ee/app/models/geo/base_registry.rb'
- 'ee/app/models/geo/design_registry.rb'
- 'ee/app/models/geo/project_registry.rb'
- 'ee/app/models/geo/upload_registry.rb'
- 'ee/app/models/geo_node.rb'

18
app/graphql/resolvers/ci/runners_resolver.rb
View File

@ -85,24 +85,6 @@ module Resolvers
tag_list: [:tags]
})
end
def nested_preloads
{
created_by: {
creator: {
full_path: [:route],
web_path: [:route],
web_url: [:route]
}
},
owner_project: {
owner_project: {
full_path: [:route, { namespace: [:route] }],
web_url: [:route, { namespace: [:route] }]
}
}
}
end
end
end
end

1
config/initializers_before_autoloader/000_inflections.rb
View File

@ -18,7 +18,6 @@ ActiveSupport::Inflector.inflections do |inflect|
ci_secure_file_registry
container_repository_registry
dependency_proxy_blob_registry
design_registry
design_management_repository_registry
dependency_proxy_manifest_registry
event_log

2
doc/administration/geo/replication/datatypes.md
View File

@ -201,7 +201,7 @@ successfully, you must replicate their data using some other means.
|[CI Secure Files](https://gitlab.com/gitlab-org/gitlab/-/blob/master/app/models/ci/secure_file.rb) | [**Yes** (15.3)](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91430) | [**Yes** (15.3)](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91430) | [**Yes** (15.3)](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91430) | [No](object_storage.md#verification-of-files-in-object-storage) | Verification is behind the feature flag `geo_ci_secure_file_replication`, enabled by default in 15.3. |
|[Container Registry](../../packages/container_registry.md) | **Yes** (12.3)<sup>1</sup> | **Yes** (15.10) | **Yes** (12.3)<sup>1</sup> | **Yes** (15.10) | See [instructions](container_registry.md) to set up the Container Registry replication. |
|[Terraform Module Registry](../../../user/packages/terraform_module_registry/index.md) | **Yes** (14.0) | **Yes** (14.0) | [**Yes** (15.1)](https://gitlab.com/groups/gitlab-org/-/epics/5551) | [No](object_storage.md#verification-of-files-in-object-storage) | Behind feature flag `geo_package_file_replication`, enabled by default. |
|[Project designs repository](../../../user/project/issues/design_management.md) | **Yes** (12.7) | **Yes** (16.1) | N/A | N/A | Designs also require replication of LFS objects and Uploads. Replication is behind the feature flag `geo_design_management_repository_replication`, enabled by default.|
|[Project designs repository](../../../user/project/issues/design_management.md) | **Yes** (12.7) | **Yes** (16.1) | N/A | N/A | Designs also require replication of LFS objects and Uploads. |
|[Package Registry](../../../user/packages/package_registry/index.md) | **Yes** (13.2) | **Yes** (13.10) | [**Yes** (15.1)](https://gitlab.com/groups/gitlab-org/-/epics/5551) | [No](object_storage.md#verification-of-files-in-object-storage) | Behind feature flag `geo_package_file_replication`, enabled by default. |
|[Versioned Terraform State](../../terraform_state.md) | **Yes** (13.5) | **Yes** (13.12) | [**Yes** (15.1)](https://gitlab.com/groups/gitlab-org/-/epics/5551) | [No](object_storage.md#verification-of-files-in-object-storage) | Replication is behind the feature flag `geo_terraform_state_version_replication`, enabled by default. Verification was behind the feature flag `geo_terraform_state_version_verification`, which was removed in 14.0. |
|[External merge request diffs](../../merge_request_diffs.md) | **Yes** (13.5) | **Yes** (14.6) | [**Yes** (15.1)](https://gitlab.com/groups/gitlab-org/-/epics/5551) | [No](object_storage.md#verification-of-files-in-object-storage) | Replication is behind the feature flag `geo_merge_request_diff_replication`, enabled by default. Verification was behind the feature flag `geo_merge_request_diff_verification`, removed in 14.7.|

2
doc/administration/geo/replication/troubleshooting.md
View File

@ -177,7 +177,7 @@ http://secondary.example.com/
Project Wiki Repositories: succeeded 6789 / total 6789 (100%)
Attachments: succeeded 4 / total 4 (100%)
CI job artifacts: succeeded 0 / total 0 (0%)
Design repositories: succeeded 1 / total 1 (100%)
Design management repositories: succeeded 1 / total 1 (100%)
LFS Objects: failed 1 / succeeded 2 / total 3 (67%)
Merge Request Diffs: succeeded 0 / total 0 (0%)
Package Files: failed 1 / succeeded 2 / total 3 (67%)

12
doc/api/geo_nodes.md
View File

@ -334,10 +334,6 @@ Example response:
"job_artifacts_failed_count": null,
"job_artifacts_synced_missing_on_primary_count": 0,
"job_artifacts_synced_in_percentage": "0.00%",
"design_repositories_count": 3,
"design_repositories_synced_count": null,
"design_repositories_failed_count": null,
"design_repositories_synced_in_percentage": "0.00%",
"projects_count": 41,
"repositories_count": 41,
"repositories_failed_count": null,
@ -586,10 +582,6 @@ Example response:
"job_artifacts_failed_count": 1,
"job_artifacts_synced_missing_on_primary_count": 0,
"job_artifacts_synced_in_percentage": "50.00%",
"design_repositories_count": 3,
"design_repositories_synced_count": null,
"design_repositories_failed_count": null,
"design_repositories_synced_in_percentage": "0.00%",
"design_management_repositories_count": 5,
"design_management_repositories_synced_count": 5,
"design_management_repositories_failed_count": 5,
@ -817,10 +809,6 @@ Example response:
"job_artifacts_failed_count": 1,
"job_artifacts_synced_missing_on_primary_count": 0,
"job_artifacts_synced_in_percentage": "50.00%",
"design_repositories_count": 3,
"design_repositories_synced_count": null,
"design_repositories_failed_count": null,
"design_repositories_synced_in_percentage": "0.00%",
"projects_count": 41,
"repositories_count": 41,
"repositories_failed_count": 1,

15
doc/api/geo_sites.md
View File

@ -307,10 +307,6 @@ Example response:
"repositories_retrying_verification_count": null,
"projects_count": 19,
"container_repositories_replication_enabled": null,
"design_repositories_replication_enabled": null,
"design_repositories_count": null,
"design_repositories_synced_count": null,
"design_repositories_failed_count": null,
"lfs_objects_count": 0,
"lfs_objects_checksum_total_count": 0,
"lfs_objects_checksummed_count": 0,
@ -470,7 +466,6 @@ Example response:
"repositories_verified_in_percentage": "0.00%",
"repositories_checked_in_percentage": "0.00%",
"replication_slots_used_in_percentage": "100.00%",
"design_repositories_synced_in_percentage": "0.00%",
"lfs_objects_synced_in_percentage": "0.00%",
"lfs_objects_verified_in_percentage": "0.00%",
"merge_request_diffs_synced_in_percentage": "0.00%",
@ -545,10 +540,6 @@ Example response:
"repositories_retrying_verification_count": 0,
"projects_count": 19,
"container_repositories_replication_enabled": null,
"design_repositories_replication_enabled": true,
"design_repositories_count": 0,
"design_repositories_synced_count": 0,
"design_repositories_failed_count": 0,
"lfs_objects_count": 0,
"lfs_objects_checksum_total_count": null,
"lfs_objects_checksummed_count": null,
@ -708,7 +699,6 @@ Example response:
"repositories_verified_in_percentage": "0.00%",
"repositories_checked_in_percentage": "0.00%",
"replication_slots_used_in_percentage": "0.00%",
"design_repositories_synced_in_percentage": "0.00%",
"lfs_objects_synced_in_percentage": "0.00%",
"lfs_objects_verified_in_percentage": "0.00%",
"merge_request_diffs_synced_in_percentage": "0.00%",
@ -799,10 +789,6 @@ Example response:
"repositories_retrying_verification_count": 0,
"projects_count": 19,
"container_repositories_replication_enabled": null,
"design_repositories_replication_enabled": true,
"design_repositories_count": 0,
"design_repositories_synced_count": 0,
"design_repositories_failed_count": 0,
"lfs_objects_count": 0,
"lfs_objects_checksum_total_count": null,
"lfs_objects_checksummed_count": null,
@ -962,7 +948,6 @@ Example response:
"repositories_verified_in_percentage": "0.00%",
"repositories_checked_in_percentage": "0.00%",
"replication_slots_used_in_percentage": "0.00%",
"design_repositories_synced_in_percentage": "0.00%",
"lfs_objects_synced_in_percentage": "0.00%",
"lfs_objects_verified_in_percentage": "0.00%",
"merge_request_diffs_synced_in_percentage": "0.00%",

2
doc/api/graphql/reference/index.md
View File

@ -16471,7 +16471,7 @@ four standard [pagination arguments](#connection-pagination-arguments):
##### `GeoNode.designManagementRepositoryRegistries`
Find Design Repository registries on this Geo node. Ignored if `geo_design_management_repository_replication` feature flag is disabled.
Find Design Management Repository registries on this Geo node.
WARNING:
**Introduced** in 16.1.

6
locale/gitlab.pot
View File

@ -16502,12 +16502,6 @@ msgstr ""
msgid "Design Management files and data"
msgstr ""
msgid "Design repositories"
msgstr ""
msgid "Design repository"
msgstr ""
msgid "DesignManagement|%{current_design} of %{designs_count}"
msgstr ""

3
spec/support/rspec_order_todo.yml
View File

@ -526,7 +526,6 @@
- './ee/spec/finders/epics_finder_spec.rb'
- './ee/spec/finders/geo/ci_secure_file_registry_finder_spec.rb'
- './ee/spec/finders/geo/container_repository_registry_finder_spec.rb'
- './ee/spec/finders/geo/design_registry_finder_spec.rb'
- './ee/spec/finders/geo/group_wiki_repository_registry_finder_spec.rb'
- './ee/spec/finders/geo/lfs_object_registry_finder_spec.rb'
- './ee/spec/finders/geo/merge_request_diff_registry_finder_spec.rb'
@ -1395,7 +1394,6 @@
- './ee/spec/lib/gitlab/geo/log_cursor/daemon_spec.rb'
- './ee/spec/lib/gitlab/geo/log_cursor/event_logs_spec.rb'
- './ee/spec/lib/gitlab/geo/log_cursor/events/cache_invalidation_event_spec.rb'
- './ee/spec/lib/gitlab/geo/log_cursor/events/design_repository_updated_event_spec.rb'
- './ee/spec/lib/gitlab/geo/log_cursor/events/event_spec.rb'
- './ee/spec/lib/gitlab/geo/log_cursor/events/hashed_storage_attachments_event_spec.rb'
- './ee/spec/lib/gitlab/geo/log_cursor/events/hashed_storage_migrated_event_spec.rb'
@ -1758,7 +1756,6 @@
- './ee/spec/models/geo/ci_secure_file_registry_spec.rb'
- './ee/spec/models/geo/container_repository_registry_spec.rb'
- './ee/spec/models/geo/deleted_project_spec.rb'
- './ee/spec/models/geo/design_registry_spec.rb'
- './ee/spec/models/geo/event_log_spec.rb'
- './ee/spec/models/geo/event_log_state_spec.rb'
- './ee/spec/models/geo/every_geo_event_spec.rb'

2
spec/workers/every_sidekiq_worker_spec.rb
View File

@ -235,8 +235,6 @@ RSpec.describe 'Every Sidekiq worker', feature_category: :shared do
'Geo::Batch::ProjectRegistrySchedulerWorker' => 3,
'Geo::Batch::ProjectRegistryWorker' => 3,
'Geo::ContainerRepositorySyncWorker' => 1,
'Geo::DesignRepositoryShardSyncWorker' => false,
'Geo::DesignRepositorySyncWorker' => 1,
'Geo::DestroyWorker' => 3,
'Geo::EventWorker' => 3,
'Geo::FileRemovalWorker' => 3,