From 62d12a8a8d24d89c4aa447b773cffabcd0d630d9 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 4 Nov 2024 12:16:26 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .rubocop_todo/gitlab/strong_memoize_attr.yml | 12 - .rubocop_todo/layout/line_length.yml | 15 - .../lint/useless_numeric_operation.yml | 6 - GITLAB_KAS_VERSION | 2 +- .../design_notes/design_discussion.vue | 2 +- .../javascripts/diffs/components/app.vue | 2 + .../diffs/components/diff_file.vue | 9 + .../incidents/timeline_events_form.vue | 2 +- .../repository/components/table/index.vue | 2 +- .../design_notes/design_discussion.vue | 2 +- .../rich_timestamp_tooltip.stories.js | 23 + app/assets/stylesheets/framework/common.scss | 5 - app/assets/stylesheets/framework/tables.scss | 4 +- .../page_bundles/design_management.scss | 2 +- app/assets/stylesheets/page_bundles/tree.scss | 42 +- app/components/pajamas/avatar_component.rb | 33 +- app/controllers/application_controller.rb | 11 +- app/controllers/concerns/boards_actions.rb | 10 +- app/controllers/concerns/creates_commit.rb | 5 +- app/controllers/concerns/find_snippet.rb | 5 +- app/controllers/concerns/impersonation.rb | 5 +- app/controllers/concerns/issuable_actions.rb | 21 +- .../concerns/issuable_collections.rb | 51 +- app/controllers/concerns/known_sign_in.rb | 5 +- app/controllers/ide_controller.rb | 9 +- app/controllers/import/github_controller.rb | 5 +- app/controllers/invites_controller.rb | 12 +- .../oauth/authorizations_controller.rb | 3 +- app/finders/autocomplete/users_finder.rb | 2 +- app/graphql/types/merge_request_type.rb | 40 +- app/graphql/types/milestone_sort_enum.rb | 10 +- app/graphql/types/milestone_type.rb | 6 +- .../types/namespace/package_settings_type.rb | 12 +- app/graphql/types/notes/noteable_interface.rb | 6 +- .../types/packages/composer/metadatum_type.rb | 3 +- .../packages/conan/file_metadatum_type.rb | 15 +- .../types/packages/helm/dependency_type.rb | 9 +- .../types/packages/helm/metadata_type.rb | 24 +- .../nuget/dependency_link_metadatum_type.rb | 6 +- .../packages/package_dependency_link_type.rb | 3 +- .../types/packages/package_details_type.rb | 18 +- .../types/packages/package_type_enum.rb | 4 +- .../types/packages/pypi/metadatum_type.rb | 3 +- app/graphql/types/project_type.rb | 6 +- app/helpers/search_helper.rb | 8 +- .../concerns/integrations/base/integration.rb | 821 ++++++++++++++++++ app/models/integration.rb | 793 +---------------- .../integrations/instance/integration.rb | 27 + .../integrations/instance_integration.rb | 12 - app/models/user.rb | 13 + .../concerns/users/participable_service.rb | 2 + app/views/layouts/_page.html.haml | 1 + ...autocomplete_group_search_optimization.yml | 9 + config/initializers/0_license.rb | 29 + config/sidekiq_queues.yml | 4 + db/docs/instance_integrations.yml | 2 +- db/docs/pipl_users.yml | 11 + .../20241016095329_create_pipl_users_table.rb | 19 + db/schema_migrations/20241016095329 | 1 + db/structure.sql | 16 + doc/administration/issue_closing_pattern.md | 13 +- doc/api/graphql/reference/index.md | 1 + doc/development/sidekiq/idempotent_jobs.md | 4 +- doc/subscriptions/gitlab_com/index.md | 3 +- doc/subscriptions/self_managed/index.md | 4 +- .../project/merge_requests/dependencies.md | 66 +- doc/user/project/merge_requests/manage.md | 8 +- .../img/multiline-comment-saved_v13_3.png | Bin 34361 -> 0 bytes .../img/multiline-comment-saved_v17_5.png | Bin 0 -> 15226 bytes .../project/merge_requests/reviews/index.md | 18 +- .../merge_requests/reviews/suggestions.md | 9 +- doc/user/project/merge_requests/widgets.md | 2 +- lib/gitlab/middleware/go.rb | 2 +- locale/gitlab.pot | 3 + package.json | 2 +- .../integrations/instance/integrations.rb | 7 + .../integrations/instance_integrations.rb | 7 - .../finders/autocomplete/users_finder_spec.rb | 14 + .../notes/store/legacy_notes/mutation_spec.js | 507 +++++------ spec/helpers/search_helper_spec.rb | 65 ++ spec/lib/gitlab/middleware/go_spec.rb | 7 +- .../integrations/instance/integration_spec.rb | 31 + spec/models/user_spec.rb | 53 ++ spec/scripts/internal_events/server_spec.rb | 4 +- .../projects/participants_service_spec.rb | 14 + .../workers/idempotency_shared_examples.rb | 4 +- yarn.lock | 112 +-- 87 files changed, 1788 insertions(+), 1412 deletions(-) delete mode 100644 .rubocop_todo/lint/useless_numeric_operation.yml create mode 100644 app/assets/javascripts/work_items/components/rich_timestamp_tooltip.stories.js create mode 100644 app/models/concerns/integrations/base/integration.rb create mode 100644 app/models/integrations/instance/integration.rb delete mode 100644 app/models/integrations/instance_integration.rb create mode 100644 config/feature_flags/gitlab_com_derisk/autocomplete_group_search_optimization.yml create mode 100644 config/initializers/0_license.rb create mode 100644 db/docs/pipl_users.yml create mode 100644 db/migrate/20241016095329_create_pipl_users_table.rb create mode 100644 db/schema_migrations/20241016095329 delete mode 100644 doc/user/project/merge_requests/reviews/img/multiline-comment-saved_v13_3.png create mode 100644 doc/user/project/merge_requests/reviews/img/multiline-comment-saved_v17_5.png create mode 100644 spec/factories/integrations/instance/integrations.rb delete mode 100644 spec/factories/integrations/instance_integrations.rb create mode 100644 spec/models/integrations/instance/integration_spec.rb diff --git a/.rubocop_todo/gitlab/strong_memoize_attr.yml b/.rubocop_todo/gitlab/strong_memoize_attr.yml index 8cf4cf5655d..7309e1d9753 100644 --- a/.rubocop_todo/gitlab/strong_memoize_attr.yml +++ b/.rubocop_todo/gitlab/strong_memoize_attr.yml @@ -2,19 +2,7 @@ # Cop supports --autocorrect. Gitlab/StrongMemoizeAttr: Exclude: - - 'app/components/pajamas/avatar_component.rb' - - 'app/controllers/application_controller.rb' - - 'app/controllers/concerns/boards_actions.rb' - - 'app/controllers/concerns/creates_commit.rb' - - 'app/controllers/concerns/find_snippet.rb' - - 'app/controllers/concerns/impersonation.rb' - - 'app/controllers/concerns/issuable_actions.rb' - - 'app/controllers/concerns/issuable_collections.rb' - - 'app/controllers/concerns/known_sign_in.rb' - 'app/controllers/concerns/wiki_actions.rb' - - 'app/controllers/ide_controller.rb' - - 'app/controllers/import/github_controller.rb' - - 'app/controllers/invites_controller.rb' - 'app/controllers/jira_connect/application_controller.rb' - 'app/controllers/jwt_controller.rb' - 'app/controllers/oauth/authorizations_controller.rb' diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml index 07a492e1de6..0ef26bb32cf 100644 --- a/.rubocop_todo/layout/line_length.yml +++ b/.rubocop_todo/layout/line_length.yml @@ -122,22 +122,7 @@ Layout/LineLength: - 'app/graphql/types/issue_sort_enum.rb' - 'app/graphql/types/issue_type.rb' - 'app/graphql/types/member_interface.rb' - - 'app/graphql/types/merge_request_type.rb' - - 'app/graphql/types/milestone_sort_enum.rb' - - 'app/graphql/types/milestone_type.rb' - - 'app/graphql/types/namespace/package_settings_type.rb' - 'app/graphql/types/notes/diff_position_input_type.rb' - - 'app/graphql/types/notes/noteable_interface.rb' - - 'app/graphql/types/packages/composer/metadatum_type.rb' - - 'app/graphql/types/packages/conan/file_metadatum_type.rb' - - 'app/graphql/types/packages/helm/dependency_type.rb' - - 'app/graphql/types/packages/helm/metadata_type.rb' - - 'app/graphql/types/packages/nuget/dependency_link_metadatum_type.rb' - - 'app/graphql/types/packages/package_dependency_link_type.rb' - - 'app/graphql/types/packages/package_details_type.rb' - - 'app/graphql/types/packages/package_type_enum.rb' - - 'app/graphql/types/packages/pypi/metadatum_type.rb' - - 'app/graphql/types/project_type.rb' - 'app/graphql/types/query_type.rb' - 'app/graphql/types/repository/blob_type.rb' - 'app/graphql/types/repository_type.rb' diff --git a/.rubocop_todo/lint/useless_numeric_operation.yml b/.rubocop_todo/lint/useless_numeric_operation.yml deleted file mode 100644 index a45a71a1989..00000000000 --- a/.rubocop_todo/lint/useless_numeric_operation.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -# Cop supports --autocorrect. -Lint/UselessNumericOperation: - Details: grace period - Exclude: - - 'ee/spec/lib/gitlab/geo_spec.rb' diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION index 8e3ba8944b0..385b9bcc0b6 100644 --- a/GITLAB_KAS_VERSION +++ b/GITLAB_KAS_VERSION @@ -1 +1 @@ -e8ecda472f3b2d7ea74fda18e64d9bf77e2e1487 +2bb6448d821d9436d6b74b064a4cb48965603182 diff --git a/app/assets/javascripts/design_management/components/design_notes/design_discussion.vue b/app/assets/javascripts/design_management/components/design_notes/design_discussion.vue index a01c3a05a71..f272c5375d5 100644 --- a/app/assets/javascripts/design_management/components/design_notes/design_discussion.vue +++ b/app/assets/javascripts/design_management/components/design_notes/design_discussion.vue @@ -302,7 +302,7 @@ export default {
    diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue index 61eb9c55ff4..faeec1764f7 100644 --- a/app/assets/javascripts/diffs/components/app.vue +++ b/app/assets/javascripts/diffs/components/app.vue @@ -824,6 +824,7 @@ export default { :can-current-user-fork="canCurrentUserFork" :view-diffs-file-by-file="viewDiffsFileByFile" :active="active" + :is-diff-view-active="currentDiffFileId === item.file_hash" /> @@ -844,6 +845,7 @@ export default { :help-page-path="helpPagePath" :can-current-user-fork="canCurrentUserFork" :view-diffs-file-by-file="viewDiffsFileByFile" + :is-diff-view-active="currentDiffFileId === file.file_hash" />