From bcc887fb115ce42325cee1cdaa009e96114a361b Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 24 Apr 2024 21:11:40 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../components/board_add_new_column_form.vue | 2 +- .../boards/components/board_card_inner.vue | 4 +- .../boards/components/board_column.vue | 2 +- .../javascripts/ci/job_details/job_app.vue | 2 +- .../graphql_shared/possible_types.json | 1 + .../list/components/issue_card_time_info.vue | 2 +- .../notes/components/discussion_filter.vue | 2 +- .../profile/components/user_achievements.vue | 2 +- .../label_filter/label_dropdown_items.vue | 2 +- .../surveys/components/satisfaction_rate.vue | 2 +- .../components/state_container.vue | 2 +- .../states/unresolved_discussions.vue | 2 +- .../components/registry/registry_search.vue | 29 +++-- .../notes/work_item_activity_sort_filter.vue | 2 +- .../concerns/dependency_proxy/group_access.rb | 32 ++++++ .../application_controller.rb | 48 ++++++-- ...endency_proxy_for_containers_controller.rb | 7 -- app/controllers/jwt_controller.rb | 3 +- app/models/ci/running_build.rb | 6 +- app/models/group.rb | 4 + .../policies/dependency_proxy/group.rb | 23 ++++ app/policies/group_policy.rb | 2 + .../policies/dependency_proxy/group_policy.rb | 67 +++++++++++ ...dependency_proxy_authentication_service.rb | 10 ++ .../dependency_proxy/auth_token_service.rb | 33 ++++++ app/views/groups/_home_panel.html.haml | 2 +- .../merge_requests/_merge_request.html.haml | 4 +- app/views/search/results/_issuable.html.haml | 2 +- app/views/search/results/_note.html.haml | 2 +- app/views/shared/projects/_project.html.haml | 4 +- app/views/users/_profile_sidebar.html.haml | 2 +- ..._dependency_proxy_pass_token_to_policy.yml | 9 ++ ...amespace_id_column_to_ci_running_builds.rb | 15 +++ ...nner_type_and_owner_namespace_id_and_id.rb | 16 +++ db/schema_migrations/20240419124207 | 1 + db/schema_migrations/20240419134956 | 1 + db/structure.sql | 5 +- .../auth/ldap/google_secure_ldap.md | 2 - doc/administration/auth/ldap/index.md | 7 +- .../auth/ldap/ldap_synchronization.md | 2 - doc/administration/auth/oidc.md | 2 - doc/administration/auth/smartcard.md | 25 ++-- doc/administration/credentials_inventory.md | 16 +-- doc/administration/moderate_users.md | 8 -- doc/administration/raketasks/ldap.md | 2 - .../settings/rate_limit_on_users_api.md | 2 - doc/api/access_requests.md | 4 +- doc/api/appearance.md | 2 - doc/api/applications.md | 2 - doc/api/avatar.md | 2 - doc/api/graphql/reference/index.md | 89 +++++++++++++++ doc/api/group_access_tokens.md | 7 -- doc/api/members.md | 24 +--- doc/api/plan_limits.md | 2 - doc/api/project_access_tokens.md | 10 -- doc/api/settings.md | 18 +-- doc/api/users.md | 29 ++--- doc/development/cascading_settings.md | 2 - .../permissions/predefined_roles.md | 3 +- doc/integration/ding_talk.md | 1 - doc/integration/kerberos.md | 50 +------- doc/integration/oauth_provider.md | 18 +-- doc/integration/omniauth.md | 4 - doc/integration/saml.md | 4 - doc/security/password_length_limits.md | 2 - doc/security/rate_limits.md | 12 +- doc/security/reset_user_password.md | 2 - doc/security/ssh_keys_restrictions.md | 6 +- doc/security/two_factor_authentication.md | 6 +- doc/security/user_file_uploads.md | 1 - doc/security/webhooks.md | 2 - doc/subscriptions/subscription-add-ons.md | 4 +- doc/topics/git/img/get_started_git_v16_11.png | Bin 16844 -> 16547 bytes doc/user/ai_features.md | 4 +- doc/user/custom_roles.md | 36 ++++++ doc/user/group/saml_sso/group_sync.md | 2 +- doc/user/group/saml_sso/index.md | 14 +-- .../group/settings/group_access_tokens.md | 14 +-- doc/user/packages/container_registry/index.md | 40 ++++++- doc/user/packages/go_proxy/index.md | 13 +-- doc/user/permissions.md | 8 +- .../account/two_factor_authentication.md | 31 ++--- doc/user/profile/index.md | 16 --- doc/user/profile/personal_access_tokens.md | 11 +- .../project/settings/project_access_tokens.md | 9 -- doc/user/ssh.md | 17 +-- keeps/helpers/groups.rb | 21 ++++ .../overdue_finalize_background_migration.rb | 78 ++++++++----- keeps/remove_duplicated_indexes.rb | 19 ++- lib/api/helpers.rb | 6 +- lib/gitlab/ci/project_config.rb | 28 +++-- lib/gitlab/ci/project_config/source.rb | 4 +- .../dependency_proxy_auth_controller_spec.rb | 48 +++++++- ...cy_proxy_for_containers_controller_spec.rb | 60 +++++++++- spec/features/groups/packages_spec.rb | 7 ++ spec/features/projects/packages_spec.rb | 7 ++ .../registry/registry_search_spec.js | 11 +- spec/keeps/helpers/groups_spec.rb | 70 ++++++++++++ .../ci/project_config/repository_spec.rb | 3 +- .../gitlab/ci/project_config/source_spec.rb | 2 +- spec/models/ci/running_build_spec.rb | 15 +++ spec/policies/group_policy_spec.rb | 1 + .../dependency_proxy/group_policy_spec.rb | 99 ++++++++++++++++ spec/requests/jwt_controller_spec.rb | 10 +- ...dency_proxy_authentication_service_spec.rb | 70 ++++++++++-- .../auth_token_service_spec.rb | 108 ++++++++++++++++++ spec/support/finder_collection_allowlist.yml | 1 + .../helpers/dependency_proxy_helpers.rb | 7 +- .../features/packages_shared_examples.rb | 37 ++++++ 109 files changed, 1156 insertions(+), 497 deletions(-) create mode 100644 app/models/packages/policies/dependency_proxy/group.rb create mode 100644 app/policies/packages/policies/dependency_proxy/group_policy.rb create mode 100644 config/feature_flags/gitlab_com_derisk/packages_dependency_proxy_pass_token_to_policy.yml create mode 100644 db/migrate/20240419124207_add_runner_owner_namespace_id_column_to_ci_running_builds.rb create mode 100644 db/migrate/20240419134956_add_index_running_builds_on_runner_type_and_owner_namespace_id_and_id.rb create mode 100644 db/schema_migrations/20240419124207 create mode 100644 db/schema_migrations/20240419134956 create mode 100644 spec/policies/packages/policies/dependency_proxy/group_policy_spec.rb diff --git a/app/assets/javascripts/boards/components/board_add_new_column_form.vue b/app/assets/javascripts/boards/components/board_add_new_column_form.vue index 3975a4258aa..aa6e506e847 100644 --- a/app/assets/javascripts/boards/components/board_add_new_column_form.vue +++ b/app/assets/javascripts/boards/components/board_add_new_column_form.vue @@ -41,7 +41,7 @@ export default {