From 7a33080fff9a735cbe77968d67b13ffa92c0ffae Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 14 Jun 2023 15:09:43 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .rubocop_todo/layout/line_length.yml | 1 - GITALY_SERVER_VERSION | 2 +- .../protected_branch_create.js | 6 +- .../super_sidebar/components/menu_section.vue | 2 +- app/assets/stylesheets/framework/files.scss | 1 - .../page_bundles/web_ide_loader.scss | 38 +++ .../settings/branch_rules_controller.rb | 4 +- .../settings/repository_controller.rb | 1 - .../users/set_namespace_commit_email.rb | 44 ++++ app/graphql/resolvers/blobs_resolver.rb | 14 +- app/graphql/resolvers/last_commit_resolver.rb | 3 +- .../resolvers/paginated_tree_resolver.rb | 12 +- app/graphql/resolvers/tree_resolver.rb | 8 +- app/graphql/types/mutation_type.rb | 1 + app/graphql/types/ref_type_enum.rb | 11 + .../analytics/cycle_analytics/aggregation.rb | 4 +- app/models/blob.rb | 1 + app/models/repository.rb | 5 +- app/models/tree.rb | 16 +- app/models/user.rb | 6 + app/policies/user_policy.rb | 1 + app/presenters/blob_presenter.rb | 29 ++- app/presenters/tree_entry_presenter.rb | 17 +- .../set_namespace_commit_email_service.rb | 87 +++++++ app/views/devise/shared/_signup_box.html.haml | 3 +- .../_signup_omniauth_provider_list.haml | 4 +- .../shared/_signup_omniauth_providers.haml | 2 +- app/views/ide/_show.html.haml | 3 +- app/views/projects/blame/_page.html.haml | 2 +- app/views/projects/branches/index.html.haml | 6 +- .../settings/repository/show.html.haml | 3 +- app/views/shared/_ide_root.html.haml | 9 +- config/application.rb | 1 + .../development/branch_rules.yml | 8 - .../development/comment_on_files.yml | 2 +- ...mpare_project_authorization_linear_cte.yml | 8 + ...13085814_i_quickactions_unlink_monthly.yml | 24 ++ ...606094621_i_quickactions_unlink_weekly.yml | 2 - ...n_packages_id_id_to_package_build_infos.rb | 15 ++ db/schema_migrations/20230531054422 | 1 + db/structure.sql | 2 + doc/administration/audit_event_streaming.md | 36 +-- doc/administration/instance_limits.md | 2 +- doc/api/graphql/reference/index.md | 62 +++++ doc/api/packages.md | 68 +++++ doc/api/rest/index.md | 1 + doc/ci/introduction/index.md | 3 +- .../infrastructure/clusters/connect/index.md | 11 +- .../clusters/connect/new_civo_cluster.md | 3 +- .../clusters/connect/new_eks_cluster.md | 3 +- .../clusters/connect/new_gke_cluster.md | 3 +- doc/user/infrastructure/iac/index.md | 6 +- .../infrastructure/iac/terraform_state.md | 8 +- lib/api/project_packages.rb | 50 +++- lib/extracts_ref.rb | 30 ++- lib/gitlab/git/tree.rb | 2 +- lib/gitlab/pagination/cursor_based_keyset.rb | 3 +- lib/gitlab/project_authorizations.rb | 136 ++++++---- locale/gitlab.pot | 17 +- .../repository/add_new_branch_rule_spec.rb | 10 - .../settings/branch_rules_settings_spec.rb | 9 - .../settings/repository_settings_spec.rb | 9 - spec/features/users/signup_spec.rb | 118 +++++---- .../public_api/v4/packages/pipelines.json | 6 + .../users/set_namespace_commit_email_spec.rb | 75 ++++++ spec/graphql/resolvers/blobs_resolver_spec.rb | 89 ++++++- .../resolvers/last_commit_resolver_spec.rb | 24 ++ spec/lib/extracts_ref_spec.rb | 59 +++++ .../pagination/cursor_based_keyset_spec.rb | 9 + .../lib/gitlab/project_authorizations_spec.rb | 50 +++- spec/policies/user_policy_spec.rb | 4 + spec/presenters/blob_presenter_spec.rb | 26 ++ spec/presenters/tree_entry_presenter_spec.rb | 16 ++ .../users/set_namespace_commit_email_spec.rb | 106 ++++++++ spec/requests/api/project_packages_spec.rb | 243 +++++++++++++++++- ...set_namespace_commit_email_service_spec.rb | 195 ++++++++++++++ .../features/work_items_shared_examples.rb | 7 +- 77 files changed, 1653 insertions(+), 255 deletions(-) create mode 100644 app/assets/stylesheets/page_bundles/web_ide_loader.scss create mode 100644 app/graphql/mutations/users/set_namespace_commit_email.rb create mode 100644 app/graphql/types/ref_type_enum.rb create mode 100644 app/services/users/set_namespace_commit_email_service.rb delete mode 100644 config/feature_flags/development/branch_rules.yml create mode 100644 config/feature_flags/development/compare_project_authorization_linear_cte.yml create mode 100644 config/metrics/counts_28d/20230613085814_i_quickactions_unlink_monthly.yml create mode 100644 db/migrate/20230531054422_add_index_on_packages_id_id_to_package_build_infos.rb create mode 100644 db/schema_migrations/20230531054422 create mode 100644 spec/fixtures/api/schemas/public_api/v4/packages/pipelines.json create mode 100644 spec/graphql/mutations/users/set_namespace_commit_email_spec.rb create mode 100644 spec/requests/api/graphql/users/set_namespace_commit_email_spec.rb create mode 100644 spec/services/users/set_namespace_commit_email_service_spec.rb diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml index edaf6d4b669..5dcfc9a16a0 100644 --- a/.rubocop_todo/layout/line_length.yml +++ b/.rubocop_todo/layout/line_length.yml @@ -3534,7 +3534,6 @@ Layout/LineLength: - 'spec/features/user_sorts_things_spec.rb' - 'spec/features/users/login_spec.rb' - 'spec/features/users/overview_spec.rb' - - 'spec/features/users/signup_spec.rb' - 'spec/features/users/user_browses_projects_on_user_page_spec.rb' - 'spec/features/webauthn_spec.rb' - 'spec/finders/access_requests_finder_spec.rb' diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 8855008082f..5583c38cdf4 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -d3bb9a8fe1d9ff265edf3920c348b2d5993ca0a8 +fa4f0dbedd76758c0b0422da6e54441a5ac80d18 diff --git a/app/assets/javascripts/protected_branches/protected_branch_create.js b/app/assets/javascripts/protected_branches/protected_branch_create.js index cdbe39fd5e0..a11201627a4 100644 --- a/app/assets/javascripts/protected_branches/protected_branch_create.js +++ b/app/assets/javascripts/protected_branches/protected_branch_create.js @@ -95,11 +95,7 @@ export default class ProtectedBranchCreate { } hasProtectedBranchSuccessAlert() { - return ( - window.gon?.features?.branchRules && - this.isLocalStorageAvailable && - localStorage.getItem(IS_PROTECTED_BRANCH_CREATED) - ); + return this.isLocalStorageAvailable && localStorage.getItem(IS_PROTECTED_BRANCH_CREATED); } createSuccessAlert() { diff --git a/app/assets/javascripts/super_sidebar/components/menu_section.vue b/app/assets/javascripts/super_sidebar/components/menu_section.vue index 2fbdc5dc7e4..b5a8241a286 100644 --- a/app/assets/javascripts/super_sidebar/components/menu_section.vue +++ b/app/assets/javascripts/super_sidebar/components/menu_section.vue @@ -71,7 +71,7 @@ export default {