From 0512d12bf15a0fc9b3ca29d7c854b34058d931a9 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 19 Nov 2021 12:12:41 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- Gemfile | 2 +- Gemfile.lock | 4 +- app/assets/images/logos/jira-gray.svg | 1 - .../components/agent_empty_state.vue | 48 +--- .../clusters_list/components/agents.vue | 9 +- .../components/available_agents_dropdown.vue | 30 +- .../components/install_agent_modal.vue | 266 ++++++++++++------ .../javascripts/clusters_list/constants.js | 83 +++--- .../clusters_list/graphql/cache_update.js | 77 +++-- .../notes/components/diff_with_note.vue | 14 +- app/assets/stylesheets/pages/clusters.scss | 14 - .../kas/agent_configurations_resolver.rb | 2 +- app/graphql/types/base_edge.rb | 7 + app/graphql/types/base_field.rb | 2 + app/graphql/types/base_object.rb | 1 + app/graphql/types/ci/runner_web_url_edge.rb | 2 +- ...esolved_discussion_notification_service.rb | 1 + app/workers/all_queues.yml | 9 - .../propagate_service_template_worker.rb | 29 -- .../between_commits_via_list_commits.yml | 8 - config/sidekiq_queues.yml | 2 - ...ability_finding_signatures_for_findings.rb | 25 ++ ...emove_propagate_service_template_worker.rb | 11 + db/schema_migrations/20211022214523 | 1 + db/schema_migrations/20211103141403 | 1 + doc/administration/instance_limits.md | 2 +- doc/administration/object_storage.md | 2 +- doc/ci/yaml/artifacts_reports.md | 8 +- doc/development/sql.md | 3 + .../jira/img/open_jira_issues_list_v13.2.png | Bin 90251 -> 0 bytes .../jira/img/open_jira_issues_list_v14_6.png | Bin 0 -> 89984 bytes doc/integration/jira/issues.md | 4 +- doc/user/gitlab_com/index.md | 2 +- .../pipelines/ci_pipelines_pipeline.rb | 15 + lib/bulk_imports/projects/stage.rb | 4 + ...ability_finding_signatures_for_findings.rb | 13 + lib/gitlab/gitaly_client/commit_service.rb | 13 - lib/gitlab/hook_data/merge_request_builder.rb | 4 +- lib/sidebars/concerns/positionable_list.rb | 8 + lib/sidebars/panel.rb | 4 + locale/gitlab.pot | 29 +- rubocop/cop/graphql/authorize_types.rb | 2 +- scripts/rspec_helpers.sh | 2 - spec/features/clusters/create_agent_spec.rb | 2 +- .../integrations/user_activates_jira_spec.rb | 3 +- .../components/agent_empty_state_spec.js | 48 ++-- .../clusters_list/components/agents_spec.js | 19 -- .../available_agents_dropwdown_spec.js | 71 +---- .../components/install_agent_modal_spec.js | 255 ++++++++++------- spec/graphql/types/base_edge_spec.rb | 76 +++++ .../pipelines/ci_pipelines_pipeline_spec.rb | 176 ++++++++++++ spec/lib/bulk_imports/projects/stage_spec.rb | 1 + spec/lib/gitlab/diff/file_spec.rb | 6 +- .../gitaly_client/commit_service_spec.rb | 39 --- .../hook_data/merge_request_builder_spec.rb | 1 + spec/lib/sidebars/menu_spec.rb | 19 ++ ...ty_finding_signatures_for_findings_spec.rb | 88 ++++++ .../api/graphql/packages/package_spec.rb | 2 +- ...ed_discussion_notification_service_spec.rb | 12 + spec/support/helpers/graphql_helpers.rb | 9 +- spec/support/helpers/test_env.rb | 2 +- ...d_project_packages_list_shared_examples.rb | 2 +- .../helpers/graphql_helpers_spec.rb | 15 + spec/workers/every_sidekiq_worker_spec.rb | 1 - 64 files changed, 1016 insertions(+), 595 deletions(-) delete mode 100644 app/assets/images/logos/jira-gray.svg create mode 100644 app/graphql/types/base_edge.rb delete mode 100644 app/workers/propagate_service_template_worker.rb delete mode 100644 config/feature_flags/development/between_commits_via_list_commits.yml create mode 100644 db/post_migrate/20211022214523_schedule_recalculate_vulnerability_finding_signatures_for_findings.rb create mode 100644 db/post_migrate/20211103141403_remove_propagate_service_template_worker.rb create mode 100644 db/schema_migrations/20211022214523 create mode 100644 db/schema_migrations/20211103141403 delete mode 100644 doc/integration/jira/img/open_jira_issues_list_v13.2.png create mode 100644 doc/integration/jira/img/open_jira_issues_list_v14_6.png create mode 100644 lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline.rb create mode 100644 lib/gitlab/background_migration/recalculate_vulnerability_finding_signatures_for_findings.rb create mode 100644 spec/graphql/types/base_edge_spec.rb create mode 100644 spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb create mode 100644 spec/migrations/schedule_recalculate_vulnerability_finding_signatures_for_findings_spec.rb diff --git a/Gemfile b/Gemfile index da3a5504866..920798694c1 100644 --- a/Gemfile +++ b/Gemfile @@ -539,4 +539,4 @@ gem 'ipaddress', '~> 0.8.3' gem 'parslet', '~> 1.8' -gem 'ipynbdiff', '0.3.7' +gem 'ipynbdiff', '0.3.8' diff --git a/Gemfile.lock b/Gemfile.lock index 78b227123ab..df713319288 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -641,7 +641,7 @@ GEM invisible_captcha (1.1.0) rails (>= 4.2) ipaddress (0.8.3) - ipynbdiff (0.3.7) + ipynbdiff (0.3.8) diffy (= 3.3.0) json (= 2.5.1) jaeger-client (1.1.0) @@ -1510,7 +1510,7 @@ DEPENDENCIES icalendar invisible_captcha (~> 1.1.0) ipaddress (~> 0.8.3) - ipynbdiff (= 0.3.7) + ipynbdiff (= 0.3.8) jira-ruby (~> 2.1.4) js_regex (~> 3.7) json (~> 2.5.1) diff --git a/app/assets/images/logos/jira-gray.svg b/app/assets/images/logos/jira-gray.svg deleted file mode 100644 index 0e7069f2bd2..00000000000 --- a/app/assets/images/logos/jira-gray.svg +++ /dev/null @@ -1 +0,0 @@ -jira software-icon-gradient-neutral diff --git a/app/assets/javascripts/clusters_list/components/agent_empty_state.vue b/app/assets/javascripts/clusters_list/components/agent_empty_state.vue index af44a23b4b3..37cec0b2891 100644 --- a/app/assets/javascripts/clusters_list/components/agent_empty_state.vue +++ b/app/assets/javascripts/clusters_list/components/agent_empty_state.vue @@ -1,5 +1,5 @@