From 9517d0eb2ca8bde02d7fae2173e0a43b67b2b9f5 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 11 Nov 2020 12:09:06 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/docs.gitlab-ci.yml | 11 +- GITALY_SERVER_VERSION | 2 +- .../components/delete_environment_modal.vue | 42 +- .../components/environment_delete.vue | 6 +- app/assets/javascripts/importer_status.js | 4 +- .../performance/vue_performance_plugin.js | 53 ++ .../set_status_modal_wrapper.vue | 2 +- .../stylesheets/fontawesome_custom.scss | 4 - app/finders/packages/npm/package_finder.rb | 2 + app/graphql/types/issue_type.rb | 10 + app/models/merge_request.rb | 2 + app/models/project.rb | 4 +- app/policies/concerns/policy_actor.rb | 4 + app/serializers/move_to_project_entity.rb | 1 + .../create_service.rb | 17 + app/views/projects/_remove.html.haml | 3 +- app/workers/all_queues.yml | 8 + .../jira_connect/sync_project_worker.rb | 30 + ...0985-add-npm-project-level-manager-api.yml | 5 + .../233479-add-test-case-move-support.yml | 5 + ...ificant-actions-are-inconsistent-in-te.yml | 5 + .../chore-disable-admin-mode-in-services.yml | 5 + ...k-fix-set-status-modal-tooltip-trigger.yml | 5 + .../jira_connect_sync_namespace_worker.yml | 5 + ...mw-replace-fa-check-in-importer-status.yml | 5 + .../jira_connect_full_namespace_sync.yml | 7 + ...dd_merge_request_jira_reference_indexes.rb | 44 + db/schema_migrations/20201106082723 | 1 + db/structure.sql | 4 + doc/README.md | 4 +- .../graphql/reference/gitlab_schema.graphql | 20 + doc/api/graphql/reference/gitlab_schema.json | 56 ++ doc/api/graphql/reference/index.md | 4 + doc/development/integrations/secure.md | 3 +- .../img/yarn_dependency_path_v13_6.png | Bin 0 -> 126383 bytes .../dependency_list/index.md | 14 +- .../compliance/license_compliance/index.md | 4 +- doc/user/packages/npm_registry/index.md | 107 ++- lib/api/api.rb | 3 +- lib/api/concerns/packages/npm_endpoints.rb | 134 +++ lib/api/helpers/packages/npm.rb | 62 ++ lib/api/npm_instance_packages.rb | 16 + lib/api/npm_packages.rb | 175 ---- lib/api/npm_project_packages.rb | 66 ++ .../common/loaders/entities_loader.rb | 19 - .../common/loaders/entity_loader.rb | 15 + .../groups/extractors/subgroups_extractor.rb | 7 +- .../pipelines/subgroup_entities_pipeline.rb | 4 +- .../subgroup_to_entity_transformer.rb | 21 + .../subgroups_to_entities_transformer.rb | 23 - locale/gitlab.pot | 49 +- spec/features/projects_spec.rb | 2 +- .../packages/npm/package_finder_spec.rb | 6 + spec/graphql/types/issue_type_spec.rb | 2 +- ...s_loader_spec.rb => entity_loader_spec.rb} | 6 +- .../subgroup_entities_pipeline_spec.rb | 6 +- ...=> subgroup_to_entity_transformer_spec.rb} | 14 +- spec/lib/gitlab/git_access_snippet_spec.rb | 4 +- spec/models/merge_request_spec.rb | 12 + spec/models/project_spec.rb | 26 +- spec/policies/blob_policy_spec.rb | 5 +- spec/policies/wiki_page_policy_spec.rb | 5 +- spec/requests/api/graphql/issue/issue_spec.rb | 19 + .../api/npm_instance_packages_spec.rb | 31 + spec/requests/api/npm_packages_spec.rb | 556 ------------- .../requests/api/npm_project_packages_spec.rb | 281 +++++++ .../move_to_project_entity_spec.rb | 6 +- ...er_registry_authentication_service_spec.rb | 6 + .../ci/create_pipeline_service/cache_spec.rb | 4 +- .../creation_errors_and_warnings_spec.rb | 4 +- .../custom_config_content_spec.rb | 2 +- .../create_pipeline_service/dry_run_spec.rb | 2 +- .../ci/create_pipeline_service/needs_spec.rb | 5 +- .../parameter_content_spec.rb | 2 +- .../pre_post_stages_spec.rb | 4 +- .../ci/create_pipeline_service/rules_spec.rb | 4 +- .../ci/create_pipeline_service_spec.rb | 12 +- spec/services/issues/move_service_spec.rb | 35 +- .../issues/related_branches_service_spec.rb | 12 +- .../create_service_spec.rb | 30 + spec/services/labels/transfer_service_spec.rb | 7 +- .../add_context_service_spec.rb | 16 +- spec/services/notification_service_spec.rb | 22 +- .../create_service_spec.rb | 8 +- .../revoke_service_spec.rb | 15 +- .../projects/autocomplete_service_spec.rb | 28 +- spec/services/projects/create_service_spec.rb | 35 +- spec/services/projects/update_service_spec.rb | 50 +- .../create_service_spec.rb | 14 +- spec/services/search/snippet_service_spec.rb | 22 +- spec/services/todo_service_spec.rb | 24 +- .../two_factor/destroy_service_spec.rb | 2 +- spec/services/users/approve_service_spec.rb | 125 +-- spec/services/users/destroy_service_spec.rb | 82 +- .../services/users/set_status_service_spec.rb | 2 +- spec/spec_helper.rb | 3 - spec/support/helpers/admin_mode_helpers.rb | 2 + .../project_policy_table_shared_context.rb | 769 ++++++++++-------- .../api/npm_packages_shared_context.rb | 22 + .../api/npm_packages_shared_examples.rb | 270 ++++++ .../api/packages_tags_shared_examples.rb | 6 +- .../jira_connect/sync_project_worker_spec.rb | 77 ++ 102 files changed, 2360 insertions(+), 1446 deletions(-) create mode 100644 app/assets/javascripts/performance/vue_performance_plugin.js create mode 100644 app/workers/jira_connect/sync_project_worker.rb create mode 100644 changelogs/unreleased/220985-add-npm-project-level-manager-api.yml create mode 100644 changelogs/unreleased/233479-add-test-case-move-support.yml create mode 100644 changelogs/unreleased/255970-confirmation-panels-for-significant-actions-are-inconsistent-in-te.yml create mode 100644 changelogs/unreleased/chore-disable-admin-mode-in-services.yml create mode 100644 changelogs/unreleased/ek-fix-set-status-modal-tooltip-trigger.yml create mode 100644 changelogs/unreleased/jira_connect_sync_namespace_worker.yml create mode 100644 changelogs/unreleased/mw-replace-fa-check-in-importer-status.yml create mode 100644 config/feature_flags/development/jira_connect_full_namespace_sync.yml create mode 100644 db/post_migrate/20201106082723_add_merge_request_jira_reference_indexes.rb create mode 100644 db/schema_migrations/20201106082723 create mode 100644 doc/user/application_security/dependency_list/img/yarn_dependency_path_v13_6.png create mode 100644 lib/api/concerns/packages/npm_endpoints.rb create mode 100644 lib/api/helpers/packages/npm.rb create mode 100644 lib/api/npm_instance_packages.rb delete mode 100644 lib/api/npm_packages.rb create mode 100644 lib/api/npm_project_packages.rb delete mode 100644 lib/bulk_imports/common/loaders/entities_loader.rb create mode 100644 lib/bulk_imports/common/loaders/entity_loader.rb create mode 100644 lib/bulk_imports/groups/transformers/subgroup_to_entity_transformer.rb delete mode 100644 lib/bulk_imports/groups/transformers/subgroups_to_entities_transformer.rb rename spec/lib/bulk_imports/common/loaders/{entities_loader_spec.rb => entity_loader_spec.rb} (92%) rename spec/lib/bulk_imports/groups/transformers/{subgroups_to_entities_transformer_spec.rb => subgroup_to_entity_transformer_spec.rb} (65%) create mode 100644 spec/requests/api/npm_instance_packages_spec.rb delete mode 100644 spec/requests/api/npm_packages_spec.rb create mode 100644 spec/requests/api/npm_project_packages_spec.rb create mode 100644 spec/support/shared_contexts/requests/api/npm_packages_shared_context.rb create mode 100644 spec/support/shared_examples/requests/api/npm_packages_shared_examples.rb create mode 100644 spec/workers/jira_connect/sync_project_worker_spec.rb diff --git a/.gitlab/ci/docs.gitlab-ci.yml b/.gitlab/ci/docs.gitlab-ci.yml index 279bc462d71..eeccecafb8b 100644 --- a/.gitlab/ci/docs.gitlab-ci.yml +++ b/.gitlab/ci/docs.gitlab-ci.yml @@ -38,7 +38,7 @@ review-docs-cleanup: script: - ./scripts/trigger-build docs cleanup -docs lint: +docs-lint markdown: extends: - .default-retry - .docs:rules:docs-lint @@ -47,6 +47,15 @@ docs lint: needs: [] script: - scripts/lint-doc.sh + +docs-lint links: + extends: + - .default-retry + - .docs:rules:docs-lint + image: "registry.gitlab.com/gitlab-org/gitlab-docs/lint:ruby-2.7.2-alpine-3.12-vale-2.4.3-markdownlint-0.24.0" + stage: test + needs: [] + script: # Prepare docs for build # The path must be 'ee/' because we have hardcoded links relying on it # https://gitlab.com/gitlab-org/gitlab-docs/-/blob/887850752fc0e72856da6632db132f005ba77f16/content/index.erb#L44-63 diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 920d7f9bf9c..9524711e948 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -0926b9f8ff2215874eef0e22f750a74da5fe4321 +194a9f58926793ade53152de90b474d66804e21e diff --git a/app/assets/javascripts/environments/components/delete_environment_modal.vue b/app/assets/javascripts/environments/components/delete_environment_modal.vue index 29aab268fd3..2eb2be351b3 100644 --- a/app/assets/javascripts/environments/components/delete_environment_modal.vue +++ b/app/assets/javascripts/environments/components/delete_environment_modal.vue @@ -1,29 +1,35 @@