From b0891151f160d287e48a5317d3152b195ef950ae Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 13 Dec 2021 12:12:59 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .rubocop_todo/graphql/ordered_arguments.yml | 3 - .../active_record_subtransaction_methods.yml | 2 +- .rubocop_todo/rails/save_bang.yml | 3 - GITALY_SERVER_VERSION | 2 +- GITLAB_ELASTICSEARCH_INDEXER_VERSION | 2 +- Gemfile | 2 +- Gemfile.lock | 4 +- .../header_search/store/getters.js | 84 +++++---- .../edit/components/jira_issues_fields.vue | 7 +- app/assets/javascripts/issues/constants.js | 25 +++ .../issues/show/components/app.vue | 11 +- .../issues/show/components/form.vue | 2 +- .../issues/show/components/header_actions.vue | 3 +- .../javascripts/issues/show/constants.js | 24 --- .../notes/components/sidebar_subscription.vue | 2 +- .../javascripts/packages/shared/constants.js | 49 ----- .../javascripts/packages/shared/utils.js | 43 ----- .../details/components/app.vue | 19 +- .../details/store/actions.js | 2 +- .../list/components/packages_list.vue | 17 +- .../list/components/packages_list_app.vue | 7 +- .../list/stores/actions.js | 2 +- .../list/stores/getters.js | 2 +- .../shared/constants.js | 1 + .../shared/package_list_row.vue | 19 +- .../components/details/app.vue | 2 +- .../components/details/package_title.vue | 2 +- .../components/details/version_row.vue | 4 +- .../package_registry/components/list/app.vue | 2 +- .../components/list/package_list_row.vue | 10 +- .../components/list/packages_list.vue | 2 +- .../package_registry/constants.js | 18 +- .../components/package_icon_and_name.vue | 0 .../shared/components/package_path.vue | 0 .../shared/components/package_tags.vue | 0 .../components/packages_list_loader.vue | 0 .../shared/components/publish_method.vue | 0 .../shared/constants.js | 36 ++++ .../packages_and_registries/shared/utils.js | 10 + .../assignees/assignees_realtime.vue | 2 +- .../assignees/sidebar_assignees_widget.vue | 2 +- .../assignees/uncollapsed_assignee_list.vue | 2 +- .../sidebar_confidentiality_form.vue | 2 +- .../components/date/sidebar_date_widget.vue | 2 +- .../components/sidebar_dropdown_widget.vue | 2 +- .../sidebar_subscriptions_widget.vue | 2 +- .../components/time_tracking/time_tracker.vue | 2 +- app/assets/javascripts/sidebar/constants.js | 2 +- .../sidebar/mount_milestone_sidebar.js | 2 +- .../javascripts/sidebar/mount_sidebar.js | 2 +- .../components/notes/placeholder_note.vue | 10 +- .../labels_select_root.vue | 2 +- .../list/components/issuable_item.vue | 2 + .../show/components/issuable_show_root.vue | 2 +- .../graphql/create_work_item.mutation.graphql | 6 +- .../work_items/graphql/fragmentTypes.json | 2 +- .../work_items/graphql/provider.js | 6 +- .../work_items/graphql/resolvers.js | 20 +- .../work_items/graphql/typedefs.graphql | 46 ++--- .../graphql/update_work_item.mutation.graphql | 6 +- .../graphql/widget.fragment.graphql | 2 +- .../graphql/work_item.query.graphql | 2 +- .../work_items/pages/create_work_item.vue | 5 +- .../stylesheets/highlight/themes/dark.scss | 6 +- .../stylesheets/highlight/themes/monokai.scss | 6 +- .../stylesheets/highlight/themes/none.scss | 6 +- .../highlight/themes/solarized-dark.scss | 6 +- .../highlight/themes/solarized-light.scss | 6 +- .../stylesheets/highlight/white_base.scss | 6 +- app/assets/stylesheets/pages/search.scss | 45 +++++ app/controllers/graphql_controller.rb | 6 +- app/graphql/resolvers/base_issues_resolver.rb | 6 +- .../design_management/designs_resolver.rb | 12 +- .../version/design_at_version_resolver.rb | 8 +- app/helpers/x509_helper.rb | 2 +- app/models/commit_signatures/gpg_signature.rb | 53 ++++++ .../x509_commit_signature.rb | 16 ++ app/models/concerns/commit_signature.rb | 50 +++++ app/models/gpg_key.rb | 6 +- app/models/gpg_signature.rb | 86 --------- app/models/packages/conan/metadatum.rb | 11 +- app/models/x509_certificate.rb | 2 +- app/models/x509_commit_signature.rb | 48 ----- app/services/git/branch_hooks_service.rb | 4 +- app/views/admin/projects/_archived.html.haml | 3 +- app/views/groups/projects.html.haml | 3 +- .../shared/_matching_branch.html.haml | 2 +- app/views/search/results/_blob.html.haml | 3 +- app/views/search/results/_blob_data.html.haml | 2 +- .../search/results/_blob_highlight.html.haml | 22 +++ app/views/shared/members/_requests.html.haml | 2 +- app/views/shared/projects/_archived.html.haml | 3 +- ...ges_conan_allow_empty_username_channel.yml | 8 - config/initializers/grape_validators.rb | 3 - .../20210216175101_merge_requests_users.yml | 2 +- .../counts_28d/20210216175542_ci_builds.yml | 2 +- .../20210216175546_ci_internal_pipelines.yml | 2 +- ...16175550_ci_pipeline_config_repository.yml | 2 +- .../20210216175554_ci_pipelines.yml | 2 +- ...monthly_active_users_design_management.yml | 2 +- .../counts_28d/20210216181050_packages.yml | 2 +- .../counts_28d/20210216181139_issues.yml | 2 +- .../counts_28d/20210216181158_epics.yml | 2 +- ...gement_issue_milestone_changed_monthly.yml | 2 +- .../counts_28d/20210216181935_deployments.yml | 2 +- .../counts_28d/20210216181939_releases.yml | 2 +- ...tion_monthly_active_users_project_repo.yml | 2 +- .../counts_28d/20210216183701_jira.yml | 2 +- ..._i_code_review_user_approve_mr_monthly.yml | 2 +- ..._templates_total_unique_counts_monthly.yml | 2 +- ...e_review_category_monthly_active_users.yml | 4 +- .../20210216175229_auto_devops_enabled.yml | 2 +- .../counts_all/20210216175520_ci_runners.yml | 2 +- .../20210216175537_ci_pipelines.yml | 2 +- .../20210216181011_projects_with_packages.yml | 2 +- .../20210216182004_commit_comment.yml | 2 +- .../20210216182006_source_code_pushes.yml | 2 +- .../license/20210204124936_pages_version.yml | 2 +- ...204124856_instance_auto_devops_enabled.yml | 2 +- ...10204124858_container_registry_enabled.yml | 2 +- ...04124902_gitlab_shared_runners_enabled.yml | 2 +- ...10204124914_prometheus_metrics_enabled.yml | 2 +- .../settings/20210204124934_pages_enabled.yml | 2 +- .../settings/20210216180913_enabled.yml | 2 +- doc/user/packages/conan_repository/index.md | 3 +- .../repository/x509_signed_commits/index.md | 2 +- lib/api/concerns/packages/conan_endpoints.rb | 13 +- lib/api/entities/commit_signature.rb | 4 +- .../validators/packages_conan_user_channel.rb | 32 ---- lib/gitlab/gpg/commit.rb | 6 +- .../gpg/invalid_gpg_signature_updater.rb | 4 +- lib/gitlab/x509/commit.rb | 6 +- lib/tasks/gitlab/x509/update.rake | 4 +- locale/gitlab.pot | 6 + qa/qa/page/project/settings/services/jira.rb | 15 ++ qa/qa/page/project/sub_menus/issues.rb | 8 + qa/qa/vendor/jira/jira_api.rb | 48 ++++- spec/controllers/graphql_controller_spec.rb | 11 ++ .../{ => commit_signature}/gpg_signature.rb | 2 +- .../x509_commit_signature.rb | 2 +- spec/features/admin/admin_projects_spec.rb | 2 +- .../search/user_searches_for_code_spec.rb | 19 +- spec/fixtures/clusters/ca_certificate.pem | 23 --- spec/fixtures/clusters/chain_certificates.pem | 174 ++++++++---------- .../clusters/intermediate_certificate.pem | 52 +++--- spec/fixtures/clusters/leaf_certificate.pem | 37 ++++ spec/fixtures/clusters/root_certificate.pem | 66 ++----- .../header_search/store/getters_spec.js | 86 +++++---- .../issues/show/components/app_spec.js | 3 +- .../show/components/header_actions_spec.js | 3 +- spec/frontend/packages/shared/utils_spec.js | 69 ------- .../components/details/components/app_spec.js | 51 +++-- .../components/details/store/actions_spec.js | 2 +- .../list/components/packages_list_app_spec.js | 7 +- .../list/components/packages_list_spec.js | 18 +- .../components/list/stores/actions_spec.js | 2 +- .../shared/package_list_row_spec.js | 6 +- .../components/details/package_title_spec.js | 2 +- .../components/details/version_row_spec.js | 4 +- .../components/list/package_list_row_spec.js | 6 +- .../components/list/packages_list_spec.js | 2 +- .../__snapshots__/publish_method_spec.js.snap | 0 .../shared}/package_icon_and_name_spec.js | 2 +- .../shared}/package_path_spec.js | 2 +- .../shared}/package_tags_spec.js | 2 +- .../shared}/packages_list_loader_spec.js | 2 +- .../shared}/publish_method_spec.js | 2 +- .../shared/utils_spec.js | 30 +++ .../sidebar_assignees_widget_spec.js | 2 +- .../sidebar_reference_widget_spec.js | 2 +- .../sidebar_dropdown_widget_spec.js | 2 +- .../components/notes/placeholder_note_spec.js | 17 +- .../labels_select_root_spec.js | 2 +- spec/frontend/work_items/mock_data.js | 14 +- .../usage_trends/measurement_type_spec.rb | 12 +- .../types/ci/job_token_scope_type_spec.rb | 8 +- spec/graphql/types/issue_type_spec.rb | 10 +- .../packages_conan_user_channel_spec.rb | 42 ----- .../clusters/platforms/kubernetes_spec.rb | 29 +-- .../gpg_signature_spec.rb | 4 +- .../x509_commit_signature_spec.rb | 2 +- spec/models/packages/conan/metadatum_spec.rb | 16 +- .../api/conan_packages_shared_examples.rb | 16 +- .../create_commit_signature_worker_spec.rb | 4 +- 184 files changed, 1032 insertions(+), 1050 deletions(-) create mode 100644 app/assets/javascripts/issues/constants.js delete mode 100644 app/assets/javascripts/packages/shared/constants.js delete mode 100644 app/assets/javascripts/packages/shared/utils.js create mode 100644 app/assets/javascripts/packages_and_registries/infrastructure_registry/shared/constants.js rename app/assets/javascripts/{packages => packages_and_registries}/shared/components/package_icon_and_name.vue (100%) rename app/assets/javascripts/{packages => packages_and_registries}/shared/components/package_path.vue (100%) rename app/assets/javascripts/{packages => packages_and_registries}/shared/components/package_tags.vue (100%) rename app/assets/javascripts/{packages => packages_and_registries}/shared/components/packages_list_loader.vue (100%) rename app/assets/javascripts/{packages => packages_and_registries}/shared/components/publish_method.vue (100%) create mode 100644 app/models/commit_signatures/gpg_signature.rb create mode 100644 app/models/commit_signatures/x509_commit_signature.rb create mode 100644 app/models/concerns/commit_signature.rb delete mode 100644 app/models/gpg_signature.rb delete mode 100644 app/models/x509_commit_signature.rb create mode 100644 app/views/search/results/_blob_highlight.html.haml delete mode 100644 config/feature_flags/development/packages_conan_allow_empty_username_channel.yml delete mode 100644 lib/api/validations/validators/packages_conan_user_channel.rb rename spec/factories/{ => commit_signature}/gpg_signature.rb (76%) rename spec/factories/{ => commit_signature}/x509_commit_signature.rb (69%) delete mode 100644 spec/fixtures/clusters/ca_certificate.pem create mode 100644 spec/fixtures/clusters/leaf_certificate.pem delete mode 100644 spec/frontend/packages/shared/utils_spec.js rename spec/frontend/{packages/shared/components => packages_and_registries/shared}/__snapshots__/publish_method_spec.js.snap (100%) rename spec/frontend/{packages/shared/components => packages_and_registries/shared}/package_icon_and_name_spec.js (85%) rename spec/frontend/{packages/shared/components => packages_and_registries/shared}/package_path_spec.js (97%) rename spec/frontend/{packages/shared/components => packages_and_registries/shared}/package_tags_spec.js (97%) rename spec/frontend/{packages/shared/components => packages_and_registries/shared}/packages_list_loader_spec.js (92%) rename spec/frontend/{packages/shared/components => packages_and_registries/shared}/publish_method_spec.js (94%) delete mode 100644 spec/lib/api/validations/validators/packages_conan_user_channel_spec.rb rename spec/models/{ => commit_signatures}/gpg_signature_spec.rb (97%) rename spec/models/{ => commit_signatures}/x509_commit_signature_spec.rb (97%) diff --git a/.rubocop_todo/graphql/ordered_arguments.yml b/.rubocop_todo/graphql/ordered_arguments.yml index c153d52afc6..8477a07d6ef 100644 --- a/.rubocop_todo/graphql/ordered_arguments.yml +++ b/.rubocop_todo/graphql/ordered_arguments.yml @@ -3,9 +3,6 @@ GraphQL/OrderedArguments: Exclude: - app/graphql/mutations/jira_import/start.rb - app/graphql/mutations/merge_requests/accept.rb - - app/graphql/resolvers/base_issues_resolver.rb - - app/graphql/resolvers/design_management/designs_resolver.rb - - app/graphql/resolvers/design_management/version/design_at_version_resolver.rb - app/graphql/resolvers/design_management/version/designs_at_version_resolver.rb - app/graphql/resolvers/design_management/version_in_collection_resolver.rb - app/graphql/resolvers/group_milestones_resolver.rb diff --git a/.rubocop_todo/performance/active_record_subtransaction_methods.yml b/.rubocop_todo/performance/active_record_subtransaction_methods.yml index 0fcedb3ffc6..ada27f99eb9 100644 --- a/.rubocop_todo/performance/active_record_subtransaction_methods.yml +++ b/.rubocop_todo/performance/active_record_subtransaction_methods.yml @@ -10,7 +10,6 @@ Performance/ActiveRecordSubtransactionMethods: - app/models/design_management/design_collection.rb - app/models/error_tracking/error.rb - app/models/external_pull_request.rb - - app/models/gpg_signature.rb - app/models/merge_request.rb - app/models/plan.rb - app/models/project.rb @@ -18,6 +17,7 @@ Performance/ActiveRecordSubtransactionMethods: - app/models/x509_certificate.rb - app/models/x509_commit_signature.rb - app/models/x509_issuer.rb + - app/models/concerns/commit_signature.rb - app/services/bulk_imports/relation_export_service.rb - app/services/ci/update_build_state_service.rb - app/services/event_create_service.rb diff --git a/.rubocop_todo/rails/save_bang.yml b/.rubocop_todo/rails/save_bang.yml index 9f9d7129bb9..b4acd62a4e2 100644 --- a/.rubocop_todo/rails/save_bang.yml +++ b/.rubocop_todo/rails/save_bang.yml @@ -3,9 +3,6 @@ Rails/SaveBang: Exclude: - ee/spec/initializers/fog_google_https_private_urls_spec.rb - ee/spec/lib/analytics/merge_request_metrics_calculator_spec.rb - - ee/spec/lib/ee/gitlab/auth/ldap/sync/group_spec.rb - - ee/spec/lib/ee/gitlab/checks/push_rules/commit_check_spec.rb - - ee/spec/lib/ee/gitlab/ci/pipeline/quota/activity_spec.rb - ee/spec/lib/gitlab/auth/ldap/access_spec.rb - ee/spec/lib/gitlab/auth/o_auth/user_spec.rb - ee/spec/lib/gitlab/auth/saml/user_spec.rb diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 4c61a482397..ad5290c80a3 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -27dddad834d99e9901b4a9b137748b850e71849a +9aa8e36d420402b19210dcf861f7bf619ff39089 diff --git a/GITLAB_ELASTICSEARCH_INDEXER_VERSION b/GITLAB_ELASTICSEARCH_INDEXER_VERSION index 75249069675..d76bd2ba3ef 100644 --- a/GITLAB_ELASTICSEARCH_INDEXER_VERSION +++ b/GITLAB_ELASTICSEARCH_INDEXER_VERSION @@ -1 +1 @@ -2.16.0 +2.17.0 diff --git a/Gemfile b/Gemfile index 8dd01dc9141..97b1fe2696d 100644 --- a/Gemfile +++ b/Gemfile @@ -194,7 +194,7 @@ end gem 'state_machines-activerecord', '~> 0.8.0' # Issue tags -gem 'acts-as-taggable-on', '~> 7.0' +gem 'acts-as-taggable-on', '~> 8.1' # Background jobs gem 'sidekiq', '~> 6.3' diff --git a/Gemfile.lock b/Gemfile.lock index ba93e7ce6df..de948ac7d19 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,7 +73,7 @@ GEM minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - acts-as-taggable-on (7.0.0) + acts-as-taggable-on (8.1.0) activerecord (>= 5.0, < 6.2) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) @@ -1390,7 +1390,7 @@ DEPENDENCIES RedCloth (~> 4.3.2) acme-client (~> 2.0, >= 2.0.6) activerecord-explain-analyze (~> 0.1) - acts-as-taggable-on (~> 7.0) + acts-as-taggable-on (~> 8.1) addressable (~> 2.8) akismet (~> 3.0) apollo_upload_server (~> 2.1.0) diff --git a/app/assets/javascripts/header_search/store/getters.js b/app/assets/javascripts/header_search/store/getters.js index 85112a317cf..a1348a8aa3f 100644 --- a/app/assets/javascripts/header_search/store/getters.js +++ b/app/assets/javascripts/header_search/store/getters.js @@ -1,3 +1,4 @@ +import { omitBy, isNil } from 'lodash'; import { objectToQuery } from '~/lib/utils/url_utility'; import { @@ -12,23 +13,29 @@ import { } from '../constants'; export const searchQuery = (state) => { - const query = { - search: state.search, - nav_source: 'navbar', - project_id: state.searchContext.project?.id, - group_id: state.searchContext.group?.id, - scope: state.searchContext.scope, - }; + const query = omitBy( + { + search: state.search, + nav_source: 'navbar', + project_id: state.searchContext.project?.id, + group_id: state.searchContext.group?.id, + scope: state.searchContext?.scope, + }, + isNil, + ); return `${state.searchPath}?${objectToQuery(query)}`; }; export const autocompleteQuery = (state) => { - const query = { - term: state.search, - project_id: state.searchContext.project?.id, - project_ref: state.searchContext.ref, - }; + const query = omitBy( + { + term: state.search, + project_id: state.searchContext.project?.id, + project_ref: state.searchContext?.ref, + }, + isNil, + ); return `${state.autocompletePath}?${objectToQuery(query)}`; }; @@ -82,42 +89,43 @@ export const defaultSearchOptions = (state, getters) => { }; export const projectUrl = (state) => { - if (!state.searchContext.project || !state.searchContext.group) { - return null; - } - - const query = { - search: state.search, - nav_source: 'navbar', - project_id: state.searchContext.project.id, - group_id: state.searchContext.group.id, - scope: state.searchContext.scope, - }; + const query = omitBy( + { + search: state.search, + nav_source: 'navbar', + project_id: state.searchContext?.project?.id, + group_id: state.searchContext?.group?.id, + scope: state.searchContext?.scope, + }, + isNil, + ); return `${state.searchPath}?${objectToQuery(query)}`; }; export const groupUrl = (state) => { - if (!state.searchContext.group) { - return null; - } - - const query = { - search: state.search, - nav_source: 'navbar', - group_id: state.searchContext.group.id, - scope: state.searchContext.scope, - }; + const query = omitBy( + { + search: state.search, + nav_source: 'navbar', + group_id: state.searchContext?.group?.id, + scope: state.searchContext?.scope, + }, + isNil, + ); return `${state.searchPath}?${objectToQuery(query)}`; }; export const allUrl = (state) => { - const query = { - search: state.search, - nav_source: 'navbar', - scope: state.searchContext.scope, - }; + const query = omitBy( + { + search: state.search, + nav_source: 'navbar', + scope: state.searchContext?.scope, + }, + isNil, + ); return `${state.searchPath}?${objectToQuery(query)}`; }; diff --git a/app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue b/app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue index cd0624d6b5c..99498501f6c 100644 --- a/app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue +++ b/app/assets/javascripts/integrations/edit/components/jira_issues_fields.vue @@ -117,7 +117,11 @@ export default {