From 4dfd78cb55b08ab20124187d1aab6a431da3e302 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 29 Oct 2020 15:09:12 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/CODEOWNERS | 29 ++ .../components/grouped_test_reports_app.vue | 12 +- .../reports/components/report_section.vue | 1 + app/assets/javascripts/single_file_diff.js | 7 +- app/helpers/ci/runners_helper.rb | 8 +- .../ci/daily_build_group_report_result.rb | 9 + app/models/pages_deployment.rb | 2 + app/models/project.rb | 7 +- app/services/ci/append_build_trace_service.rb | 65 +++++ .../pages/destroy_deployments_service.rb | 16 ++ app/services/projects/update_pages_service.rb | 12 +- .../update_repository_storage_service.rb | 16 +- app/views/admin/health_check/show.html.haml | 2 +- app/views/admin/system_info/show.html.haml | 4 +- .../projects/environments/show.html.haml | 1 + .../_generic_commit_status.html.haml | 5 +- app/views/projects/no_repo.html.haml | 7 +- .../pages/_ssl_limitations_warning.html.haml | 2 +- .../_lets_encrypt_callout.html.haml | 2 +- .../components/sidebar/_assignee.html.haml | 2 +- .../components/sidebar/_due_date.html.haml | 2 +- .../components/sidebar/_labels.html.haml | 2 +- .../components/sidebar/_milestone.html.haml | 2 +- app/workers/all_queues.yml | 8 + .../destroy_pages_deployments_worker.rb | 19 ++ bin/mail_room | 3 +- bin/web_unicorn | 3 +- .../224509-replace-board-sidebar-chevron.yml | 5 + ...ons-with-gitlab-svg-warning-solid-icon.yml | 5 + .../ImproveShellScriptsVariable.yml | 5 + .../add-ci-status-css-to-environments.yml | 5 + .../allow_repo_storage_moves_without_repo.yml | 5 + config/sidekiq_queues.yml | 2 + .../graphql/reference/gitlab_schema.graphql | 91 +++++++ doc/api/graphql/reference/gitlab_schema.json | 252 ++++++++++++++++++ doc/api/graphql/reference/index.md | 11 + .../cloud_native_build_logs/index.md | 3 + .../cloud_native_gitlab_pages/index.md | 3 + .../feature_flags_development/index.md | 3 + .../blueprints/image_resizing/index.md | 3 + doc/architecture/index.md | 3 + doc/ci/lint.md | 6 + doc/downgrade_ee_to_ce/README.md | 6 + doc/install/digitaloceandocker.md | 3 + doc/install/pivotal/index.md | 6 + doc/install/postgresql_extensions.md | 6 + doc/integration/README.md | 3 + doc/integration/akismet.md | 6 + doc/integration/auth0.md | 6 + doc/integration/azure.md | 6 + doc/integration/bitbucket.md | 6 + doc/integration/cas.md | 6 + doc/integration/external-issue-tracker.md | 6 + doc/integration/facebook.md | 6 + doc/integration/github.md | 6 + doc/integration/gitlab.md | 6 + .../gmail_action_buttons_for_gitlab.md | 6 + doc/integration/google.md | 6 + doc/integration/jenkins.md | 6 + doc/integration/jenkins_deprecated.md | 6 + doc/integration/oauth2_generic.md | 6 + doc/integration/oauth_provider.md | 6 + doc/integration/omniauth.md | 6 + doc/integration/openid_connect_provider.md | 6 + doc/integration/recaptcha.md | 6 + doc/integration/salesforce.md | 6 + doc/integration/shibboleth.md | 6 + doc/integration/slash_commands.md | 6 + doc/integration/trello_power_up.md | 6 + doc/integration/twitter.md | 6 + doc/user/analytics/merge_request_analytics.md | 8 +- doc/user/group/saml_sso/index.md | 2 - lib/api/ci/runner.rb | 23 +- lib/gitlab/badge/coverage/report.rb | 12 +- locale/gitlab.pot | 3 + .../grouped_test_reports_app_spec.js | 31 +++ .../daily_build_group_report_result_spec.rb | 34 +++ spec/models/pages_deployment_spec.rb | 13 + spec/models/project_spec.rb | 23 +- .../ci/append_build_trace_service_spec.rb | 57 ++++ .../pages/destroy_deployments_service_spec.rb | 29 ++ .../projects/update_pages_service_spec.rb | 23 ++ .../update_repository_storage_service_spec.rb | 18 ++ .../destroy_pages_deployments_worker_spec.rb | 38 +++ 84 files changed, 1067 insertions(+), 59 deletions(-) create mode 100644 app/services/ci/append_build_trace_service.rb create mode 100644 app/services/pages/destroy_deployments_service.rb create mode 100644 app/workers/destroy_pages_deployments_worker.rb create mode 100644 changelogs/unreleased/224509-replace-board-sidebar-chevron.yml create mode 100644 changelogs/unreleased/225180-replace-fa-warning-icons-with-gitlab-svg-warning-solid-icon.yml create mode 100644 changelogs/unreleased/ImproveShellScriptsVariable.yml create mode 100644 changelogs/unreleased/add-ci-status-css-to-environments.yml create mode 100644 changelogs/unreleased/allow_repo_storage_moves_without_repo.yml create mode 100644 spec/services/ci/append_build_trace_service_spec.rb create mode 100644 spec/services/pages/destroy_deployments_service_spec.rb create mode 100644 spec/workers/destroy_pages_deployments_worker_spec.rb diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS index 5187ac01b58..a24fef5e44d 100644 --- a/.gitlab/CODEOWNERS +++ b/.gitlab/CODEOWNERS @@ -207,6 +207,35 @@ Dangerfile @gl-quality/eng-prod /ee/lib/gitlab/ci/reports/license_scanning/ @gitlab-org/secure/composition-analysis-be /ee/lib/gitlab/ci/reports/security/ @gitlab-org/secure/composition-analysis-be @gitlab-org/secure/dynamic-analysis-be @gitlab-org/secure/static-analysis-be @gitlab-org/secure/fuzzing-be +[Container Security] +/ee/app/views/projects/threat_monitoring/** @gitlab-org/threat-management/defend/container-security/frontend +/ee/app/assets/javascripts/pages/projects/threat_monitoring/** @gitlab-org/threat-management/defend/container-security/frontend +/ee/app/assets/javascripts/threat_monitoring/** @gitlab-org/threat-management/defend/container-security/frontend +/ee/spec/frontend/threat_monitoring/** @gitlab-org/threat-management/defend/container-security/frontend + +/ee/app/controllers/projects/threat_monitoring_controller.rb @gitlab-org/threat-management/defend/container-security/backend +/ee/spec/controllers/projects/threat_monitoring_controller_spec.rb @gitlab-org/threat-management/defend/container-security/backend +/lib/gitlab/kubernetes/cilium_network_policy.rb @gitlab-org/threat-management/defend/container-security/backend +/spec/lib/gitlab/kubernetes/cilium_network_policy_spec.rb @gitlab-org/threat-management/defend/container-security/backend +/lib/gitlab/kubernetes/network_policy_common.rb @gitlab-org/threat-management/defend/container-security/backend +/spec/support/shared_examples/lib/gitlab/kubernetes/network_policy_common_shared_examples.rb @gitlab-org/threat-management/defend/container-security/backend +/lib/gitlab/kubernetes/network_policy.rb @gitlab-org/threat-management/defend/container-security/backend +/spec/lib/gitlab/kubernetes/network_policy_spec.rb @gitlab-org/threat-management/defend/container-security/backend +/ee/app/services/network_policies/** @gitlab-org/threat-management/defend/container-security/backend +/ee/spec/services/network_policies/** @gitlab-org/threat-management/defend/container-security/backend +/ee/app/controllers/projects/security/waf_anomalies_controller.rb @gitlab-org/threat-management/defend/container-security/backend +/ee/spec/controllers/projects/security/waf_anomalies_controller_spec.rb @gitlab-org/threat-management/defend/container-security/backend +/app/models/clusters/applications/cilium.rb @gitlab-org/threat-management/defend/container-security/backend +/spec/models/clusters/applications/cilium_spec.rb @gitlab-org/threat-management/defend/container-security/backend +/ee/app/controllers/projects/security/network_policies_controller.rb @gitlab-org/threat-management/defend/container-security/backend +/ee/spec/controllers/projects/security/network_policies_controller_spec.rb @gitlab-org/threat-management/defend/container-security/backend +/ee/app/workers/network_policy_metrics_worker.rb @gitlab-org/threat-management/defend/container-security/backend +/ee/spec/workers/network_policy_metrics_worker_spec.rb @gitlab-org/threat-management/defend/container-security/backend +/ee/app/services/network_policies/** @gitlab-org/threat-management/defend/container-security/backend +/ee/spec/services/network_policies/** @gitlab-org/threat-management/defend/container-security/backend +/ee/lib/gitlab/usage_data_counters/network_policy_counter.rb @gitlab-org/threat-management/defend/container-security/backend +/ee/spec/lib/gitlab/usage_data_counters/network_policy_counter_spec.rb @gitlab-org/threat-management/defend/container-security/backend + [Code Owners] /ee/lib/gitlab/code_owners.rb @reprazent @kerrizor @garyh /ee/lib/gitlab/code_owners/ @reprazent @kerrizor @garyh diff --git a/app/assets/javascripts/reports/components/grouped_test_reports_app.vue b/app/assets/javascripts/reports/components/grouped_test_reports_app.vue index 47f04019595..29378aebdd2 100644 --- a/app/assets/javascripts/reports/components/grouped_test_reports_app.vue +++ b/app/assets/javascripts/reports/components/grouped_test_reports_app.vue @@ -1,5 +1,6 @@