From c5e4f06c597e7ef9b584595a55a82cb221804e4b Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 29 Apr 2021 15:10:07 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/rails.gitlab-ci.yml | 7 +- .rubocop_manual_todo.yml | 2 + GITALY_SERVER_VERSION | 2 +- .../boards/components/board_card.vue | 2 +- .../boards/components/board_card_inner.vue | 1 + .../boards/filtered_search_boards.js | 4 + .../components/compare_dropdown_layout.vue | 65 +++--- .../diffs/store/getters_versions_dropdowns.js | 20 +- app/assets/javascripts/flash.js | 12 +- .../framework/contextual_sidebar.scss | 24 --- app/assets/stylesheets/framework/header.scss | 24 +++ .../merge_requests/diffs_controller.rb | 5 +- .../projects/merge_requests_controller.rb | 9 + app/helpers/diff_helper.rb | 6 +- app/helpers/projects_helper.rb | 25 --- app/helpers/sidebars_helper.rb | 2 + app/models/ci/pipeline_artifact.rb | 2 + app/models/context_commits_diff.rb | 58 +++++ app/models/merge_request.rb | 6 + .../merge_request_context_commit_diff_file.rb | 4 + app/models/merge_request_diff.rb | 4 - .../context_commits_diff_entity.rb | 20 ++ app/serializers/diffs_entity.rb | 9 + .../destroy_all_expired_service.rb | 2 +- .../_prometheus.html.haml | 22 +- .../nav/sidebar/_project_menus.html.haml | 3 - .../sidebar/_project_security_link.html.haml | 21 -- app/views/projects/_home_panel.html.haml | 2 +- .../projects/merge_requests/show.html.haml | 2 +- ...alize-strings-in-_prometheus-html-haml.yml | 5 + ...ure-arbitrary-commit-revision-picker-2.yml | 5 + ...-keep-latest-pipeline-artifact-forever.yml | 5 + .../sh-fix-usage-ping-consolidated-store.yml | 5 + .../ss-fix-sidebar-issue-on-epic-boards.yml | 5 + config/application.rb | 2 - config/gitlab.yml.example | 2 +- config/initializers/stackprof.rb | 135 ------------ config/object_store_settings.rb | 5 + doc/api/projects.md | 8 +- doc/ci/pipelines/pipeline_artifacts.md | 4 +- doc/update/index.md | 13 ++ .../container_scanning/index.md | 10 +- doc/user/application_security/dast/index.md | 6 +- .../dependency_scanning/index.md | 8 +- doc/user/application_security/index.md | 20 -- doc/user/application_security/sast/index.md | 4 +- .../secret_detection/index.md | 4 +- .../vulnerabilities/index.md | 20 ++ .../compliance/license_compliance/index.md | 2 +- doc/user/project/members/index.md | 21 +- doc/user/shortcuts.md | 2 +- lib/gitlab/import_export/command_line_util.rb | 15 -- lib/gitlab/middleware/speedscope.rb | 36 ++-- lib/gitlab/stack_prof.rb | 136 ++++++++++++ .../menus/security_compliance_menu.rb | 62 ++++++ lib/sidebars/projects/panel.rb | 1 + locale/gitlab.pot | 33 +++ .../-}/speedscope/LICENSE | 0 .../speedscope => public/-}/speedscope/README | 0 .../-}/speedscope/demangle-cpp.1768f4cc.js | 0 .../speedscope/demangle-cpp.1768f4cc.js.map | 0 .../-}/speedscope/favicon-16x16.f74b3187.png | Bin .../-}/speedscope/favicon-32x32.bc503437.png | Bin .../-}/speedscope/file-format-schema.json | 0 .../-}/speedscope/import.e3a73ef4.js | 0 .../-}/speedscope/import.e3a73ef4.js.map | 0 .../-}/speedscope/index.html | 2 +- .../-}/speedscope/release.txt | 0 .../-}/speedscope/reset.8c46b7a1.css | 0 .../-}/speedscope/reset.8c46b7a1.css.map | 0 .../-}/speedscope/source-map.438fa06b.js | 0 .../-}/speedscope/source-map.438fa06b.js.map | 0 .../-}/speedscope/speedscope.026f36b0.js | 0 .../-}/speedscope/speedscope.026f36b0.js.map | 0 scripts/gitaly-test-build | 4 +- spec/config/object_store_settings_spec.rb | 4 + .../merge_requests/diffs_controller_spec.rb | 9 +- spec/factories/ci/pipeline_artifacts.rb | 4 + spec/factories/ci/pipelines.rb | 4 + .../user_can_display_performance_bar_spec.rb | 36 +++- .../boards/components/board_card_spec.js | 28 ++- spec/frontend/flash_spec.js | 14 ++ spec/helpers/projects_helper_spec.rb | 19 -- .../import_export/command_line_util_spec.rb | 29 --- spec/models/ci/pipeline_artifact_spec.rb | 24 +++ spec/models/context_commits_diff_spec.rb | 59 ++++++ .../context_commits_diff_entity_spec.rb | 25 +++ .../serializers/diffs_metadata_entity_spec.rb | 2 +- .../destroy_all_expired_service_spec.rb | 20 +- spec/support/helpers/gitaly_setup.rb | 6 +- .../nav/sidebar/_project.html.haml_spec.rb | 30 +++ .../_project_security_link.html.haml_spec.rb | 29 --- .../expire_artifacts_worker_spec.rb | 2 +- ...vertx-stacks-01-collapsed-all.2681da68.txt | 199 ------------------ 94 files changed, 834 insertions(+), 654 deletions(-) create mode 100644 app/models/context_commits_diff.rb create mode 100644 app/serializers/context_commits_diff_entity.rb delete mode 100644 app/views/layouts/nav/sidebar/_project_security_link.html.haml create mode 100644 changelogs/unreleased/Externalize-strings-in-_prometheus-html-haml.yml create mode 100644 changelogs/unreleased/feature-arbitrary-commit-revision-picker-2.yml create mode 100644 changelogs/unreleased/mo-keep-latest-pipeline-artifact-forever.yml create mode 100644 changelogs/unreleased/sh-fix-usage-ping-consolidated-store.yml create mode 100644 changelogs/unreleased/ss-fix-sidebar-issue-on-epic-boards.yml create mode 100644 lib/gitlab/stack_prof.rb create mode 100644 lib/sidebars/projects/menus/security_compliance_menu.rb rename {vendor/speedscope => public/-}/speedscope/LICENSE (100%) rename {vendor/speedscope => public/-}/speedscope/README (100%) rename {vendor/speedscope => public/-}/speedscope/demangle-cpp.1768f4cc.js (100%) rename {vendor/speedscope => public/-}/speedscope/demangle-cpp.1768f4cc.js.map (100%) rename {vendor/speedscope => public/-}/speedscope/favicon-16x16.f74b3187.png (100%) rename {vendor/speedscope => public/-}/speedscope/favicon-32x32.bc503437.png (100%) rename {vendor/speedscope => public/-}/speedscope/file-format-schema.json (100%) rename {vendor/speedscope => public/-}/speedscope/import.e3a73ef4.js (100%) rename {vendor/speedscope => public/-}/speedscope/import.e3a73ef4.js.map (100%) rename {vendor/speedscope => public/-}/speedscope/index.html (97%) rename {vendor/speedscope => public/-}/speedscope/release.txt (100%) rename {vendor/speedscope => public/-}/speedscope/reset.8c46b7a1.css (100%) rename {vendor/speedscope => public/-}/speedscope/reset.8c46b7a1.css.map (100%) rename {vendor/speedscope => public/-}/speedscope/source-map.438fa06b.js (100%) rename {vendor/speedscope => public/-}/speedscope/source-map.438fa06b.js.map (100%) rename {vendor/speedscope => public/-}/speedscope/speedscope.026f36b0.js (100%) rename {vendor/speedscope => public/-}/speedscope/speedscope.026f36b0.js.map (100%) create mode 100644 spec/models/context_commits_diff_spec.rb create mode 100644 spec/serializers/context_commits_diff_entity_spec.rb delete mode 100644 spec/views/layouts/nav/sidebar/_project_security_link.html.haml_spec.rb delete mode 100644 vendor/speedscope/speedscope/perf-vertx-stacks-01-collapsed-all.2681da68.txt diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 620de209495..01505dd5170 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -159,18 +159,13 @@ setup-test-env: expire_in: 7d paths: - config/secrets.yml + - tmp/tests/gitaly/_build/bin/ - tmp/tests/gitaly/config.toml - - tmp/tests/gitaly/gitaly - tmp/tests/gitaly/gitaly2.config.toml - - tmp/tests/gitaly/gitaly-git2go - - tmp/tests/gitaly/gitaly-hooks - - tmp/tests/gitaly/gitaly-lfs-smudge - - tmp/tests/gitaly/gitaly-ssh - tmp/tests/gitaly/internal/ - tmp/tests/gitaly/internal_gitaly2/ - tmp/tests/gitaly/internal_sockets/ - tmp/tests/gitaly/Makefile - - tmp/tests/gitaly/praefect - tmp/tests/gitaly/praefect.config.toml - tmp/tests/gitaly/ruby/ - tmp/tests/gitlab-elasticsearch-indexer/bin/gitlab-elasticsearch-indexer diff --git a/.rubocop_manual_todo.yml b/.rubocop_manual_todo.yml index a50a96e7cb8..4203803904a 100644 --- a/.rubocop_manual_todo.yml +++ b/.rubocop_manual_todo.yml @@ -1546,6 +1546,7 @@ Gitlab/NamespacedClass: - 'app/models/concerns/uniquify.rb' - 'app/models/container_expiration_policy.rb' - 'app/models/container_repository.rb' + - 'app/models/context_commits_diff.rb' - 'app/models/custom_emoji.rb' - 'app/models/data_list.rb' - 'app/models/deploy_key.rb' @@ -1960,6 +1961,7 @@ Gitlab/NamespacedClass: - 'app/serializers/container_repository_entity.rb' - 'app/serializers/container_tag_entity.rb' - 'app/serializers/container_tags_serializer.rb' + - 'app/serializers/context_commits_diff_entity.rb' - 'app/serializers/current_board_entity.rb' - 'app/serializers/current_board_serializer.rb' - 'app/serializers/current_user_entity.rb' diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 86d611f659a..ec64ca5f5ae 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -22654ba48106412ca6680366afe6a47389458720 +e0c4194d510e4fa60fbdc026d3734b462c2a6220 diff --git a/app/assets/javascripts/boards/components/board_card.vue b/app/assets/javascripts/boards/components/board_card.vue index aacea0b970c..3e9c663a036 100644 --- a/app/assets/javascripts/boards/components/board_card.vue +++ b/app/assets/javascripts/boards/components/board_card.vue @@ -46,7 +46,7 @@ export default { ...mapActions(['toggleBoardItemMultiSelection', 'toggleBoardItem']), toggleIssue(e) { // Don't do anything if this happened on a no trigger element - if (e.target.classList.contains('js-no-trigger')) return; + if (e.target.closest('.js-no-trigger')) return; const isMultiSelect = e.ctrlKey || e.metaKey; if (isMultiSelect) { diff --git a/app/assets/javascripts/boards/components/board_card_inner.vue b/app/assets/javascripts/boards/components/board_card_inner.vue index 9ff2cdd76d0..0cb2e64042e 100644 --- a/app/assets/javascripts/boards/components/board_card_inner.vue +++ b/app/assets/javascripts/boards/components/board_card_inner.vue @@ -190,6 +190,7 @@ export default {