From 73fd5a897364c6f91f86a0dd6d4b566c2574ca6e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 4 Dec 2020 00:09:55 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- app/assets/javascripts/ide/components/ide.vue | 21 +-- .../ide/components/ide_side_bar.vue | 6 +- .../ide/components/terminal/view.vue | 3 +- app/assets/javascripts/jobs/store/actions.js | 21 ++- .../javascripts/jobs/store/mutations.js | 1 + .../mutations/alert_management/base.rb | 2 +- .../http_integration/destroy.rb | 2 +- .../http_integration/reset_token.rb | 2 +- .../http_integration/update.rb | 2 +- .../prometheus_integration/reset_token.rb | 2 +- .../prometheus_integration/update.rb | 2 +- app/graphql/mutations/award_emojis/base.rb | 2 +- app/graphql/mutations/ci/base.rb | 2 +- .../mutations/design_management/base.rb | 2 +- .../mutations/discussions/toggle_resolve.rb | 2 +- app/graphql/mutations/merge_requests/base.rb | 2 +- .../metrics/dashboard/annotations/create.rb | 4 +- app/graphql/mutations/notes/create/base.rb | 2 +- app/graphql/mutations/notes/create/note.rb | 2 +- app/graphql/mutations/notes/destroy.rb | 2 +- .../notes/reposition_image_diff_note.rb | 2 +- app/graphql/mutations/notes/update/base.rb | 2 +- app/graphql/mutations/snippets/destroy.rb | 2 +- .../mutations/snippets/mark_as_spam.rb | 2 +- app/graphql/mutations/snippets/update.rb | 2 +- app/graphql/mutations/todos/mark_done.rb | 2 +- app/graphql/mutations/todos/restore.rb | 2 +- app/graphql/mutations/todos/restore_many.rb | 4 +- .../types/jira_users_mapping_input_type.rb | 2 +- app/models/project_repository_storage_move.rb | 2 +- .../composer/create_package_service.rb | 2 + .../conan/create_package_file_service.rb | 9 +- .../packages/create_package_service.rb | 16 ++- .../generic/create_package_file_service.rb | 5 +- .../generic/find_or_create_package_service.rb | 6 +- .../maven/find_or_create_package_service.rb | 2 +- .../packages/npm/create_package_service.rb | 8 -- .../packages/pypi/create_package_service.rb | 3 + .../239518_add_build_info_to_all_packages.yml | 6 + .../eb-use-code-quality-0-85-18-gitlab-1.yml | 5 + .../unreleased/fix-job-trace-polling-bug.yml | 5 + ...ix-bug-project-repository-storage-move.yml | 5 + doc/administration/consul.md | 2 +- doc/administration/database_load_balancing.md | 2 +- doc/administration/gitaly/praefect.md | 17 ++- .../graphql/reference/gitlab_schema.graphql | 124 +++++++++--------- doc/api/graphql/reference/gitlab_schema.json | 124 +++++++++--------- doc/development/adding_service_component.md | 2 +- doc/development/agent/index.md | 2 +- doc/development/changelog.md | 4 +- .../documentation/restful_api_styleguide.md | 2 +- doc/development/elasticsearch.md | 2 +- doc/development/experiment_guide/index.md | 11 ++ doc/development/fe_guide/graphql.md | 2 +- doc/development/feature_flags/controls.md | 2 +- doc/development/i18n/translation.md | 2 +- ...each_batch_users_table_bad_index_v13_7.png | Bin 23428 -> 7386 bytes .../each_batch_users_table_filter_v13_7.png | Bin 22107 -> 6940 bytes ...batch_users_table_filtered_index_v13_7.png | Bin 18135 -> 5986 bytes ...ach_batch_users_table_good_index_v13_7.png | Bin 20156 -> 7046 bytes ...ch_batch_users_table_iteration_1_v13_7.png | Bin 17850 -> 5942 bytes ...ch_batch_users_table_iteration_2_v13_7.png | Bin 19727 -> 6539 bytes ...ch_batch_users_table_iteration_3_v13_7.png | Bin 18319 -> 6665 bytes ...ch_batch_users_table_iteration_4_v13_7.png | Bin 20868 -> 6620 bytes ...ch_batch_users_table_iteration_5_v13_7.png | Bin 18462 -> 6897 bytes .../img/each_batch_users_table_v13_7.png | Bin 17762 -> 6361 bytes .../integrations/img/copy_cookies.png | Bin 127658 -> 44311 bytes .../integrations/img/copy_curl.png | Bin 212238 -> 60175 bytes .../new_fe_guide/development/accessibility.md | 2 +- .../product_analytics/usage_ping.md | 6 +- .../testing_guide/frontend_testing.md | 35 +---- doc/development/ux_guide/users.md | 4 +- doc/gitlab-basics/start-using-git.md | 2 +- doc/integration/jenkins.md | 5 +- doc/integration/jira_development_panel.md | 8 +- doc/integration/kerberos.md | 4 +- doc/subscriptions/index.md | 2 +- .../quick_start_guide.md | 2 +- doc/university/README.md | 2 +- doc/user/analytics/code_review_analytics.md | 2 +- doc/user/analytics/merge_request_analytics.md | 2 +- .../application_security/api_fuzzing/index.md | 2 +- .../application_security/cve_id_request.md | 2 +- .../compliance/license_compliance/index.md | 6 +- doc/user/group/epics/manage_epics.md | 2 +- doc/user/markdown.md | 2 +- .../packages/composer_repository/index.md | 5 +- doc/user/packages/container_registry/index.md | 4 + doc/user/packages/npm_registry/index.md | 6 +- doc/user/project/import/clearcase.md | 2 +- doc/user/project/import/github.md | 4 +- doc/user/project/integrations/github.md | 2 +- ...icrosoft_teams_select_incoming_webhook.png | Bin 30819 -> 11129 bytes .../project/integrations/jira_integrations.md | 2 +- doc/user/project/integrations/webex_teams.md | 2 +- .../index.md | 2 +- .../ssl_tls_concepts.md | 2 +- .../repository/repository_mirroring.md | 4 +- lib/api/composer_packages.rb | 2 +- lib/api/helpers/packages/conan/api_helpers.rb | 12 +- lib/api/nuget_packages.rb | 13 +- lib/api/pypi_packages.rb | 2 +- .../templates/Jobs/Code-Quality.gitlab-ci.yml | 2 +- spec/frontend/ide/components/ide_spec.js | 55 +++----- .../ide/components/terminal/view_spec.js | 18 ++- spec/frontend/jobs/store/actions_spec.js | 26 ++++ spec/frontend/jobs/store/mutations_spec.js | 1 + .../project_repository_storage_move_spec.rb | 11 ++ .../composer/create_package_service_spec.rb | 4 + .../conan/create_package_file_service_spec.rb | 13 +- .../conan/create_package_service_spec.rb | 1 + .../create_package_file_service_spec.rb | 21 +-- .../create_package_file_service_spec.rb | 8 +- .../nuget/create_package_service_spec.rb | 1 + .../pypi/create_package_service_spec.rb | 2 + .../services/packages_shared_examples.rb | 18 +++ 116 files changed, 458 insertions(+), 353 deletions(-) create mode 100644 changelogs/unreleased/239518_add_build_info_to_all_packages.yml create mode 100644 changelogs/unreleased/eb-use-code-quality-0-85-18-gitlab-1.yml create mode 100644 changelogs/unreleased/fix-job-trace-polling-bug.yml create mode 100644 changelogs/unreleased/fj-fix-bug-project-repository-storage-move.yml diff --git a/app/assets/javascripts/ide/components/ide.vue b/app/assets/javascripts/ide/components/ide.vue index f1dc855362b..f8568f46cd6 100644 --- a/app/assets/javascripts/ide/components/ide.vue +++ b/app/assets/javascripts/ide/components/ide.vue @@ -1,5 +1,6 @@