From 87af6f2e0590af0ed1bb3e5de1bb5d21855a94d2 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 16 Mar 2020 21:09:21 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .editorconfig | 15 + .gitlab/CODEOWNERS | 1 + .gitlab/issue_templates/Security Release.md | 20 +- CHANGELOG-EE.md | 7 + CHANGELOG.md | 5 +- .../eks_cluster_configuration_form.vue | 6 +- .../components/service_credentials_form.vue | 6 +- .../components/gke_dropdown_mixin.js | 3 +- .../components/gke_project_id_dropdown.vue | 6 +- app/helpers/submodule_helper.rb | 11 + app/models/ability.rb | 2 +- app/services/commits/cherry_pick_service.rb | 2 - .../link_merge_requests_service.rb | 4 - .../system_notes/merge_requests_service.rb | 2 +- app/views/shared/_no_ssh.html.haml | 17 +- .../208830-download-urls-conan-reference.yml | 6 + ...h-counting-for-some-individual-queries.yml | 5 + .../26111-fix-github-gist-links.yml | 5 + .../ac-remove-track_mr_picking-ff.yml | 5 + .../unreleased/creator-pairing-fix-alert.yml | 5 + .../unreleased/fix-x509-signed-commit.yml | 5 - .../unreleased/unlink-cache-deletions.yml | 5 + ...ed_and_provider_type_and_id_to_clusters.rb | 19 + db/schema.rb | 2 +- .../lfs/manage_large_binaries_with_git_lfs.md | 2 +- .../graphql/reference/gitlab_schema.graphql | 143 ++++++ doc/api/graphql/reference/gitlab_schema.json | 421 ++++++++++++++++++ doc/api/graphql/reference/index.md | 15 + doc/development/contributing/style_guides.md | 8 + doc/development/database_review.md | 2 + .../testing_guide/end_to_end/index.md | 4 + ...unning_tests_that_require_special_setup.md | 50 +++ doc/user/application_security/index.md | 11 +- .../offline_deployments/index.md | 55 +++ doc/user/clusters/applications.md | 19 + .../clusters/img/threat_monitoring_v12_9.png | Bin 0 -> 53242 bytes doc/user/gitlab_com/index.md | 11 +- doc/user/profile/notifications.md | 3 + .../merge_requests/cherry_pick_changes.md | 14 + .../img/cherry_pick_mr_timeline_v12_9.png | Bin 0 -> 29557 bytes doc/user/project/pages/introduction.md | 2 +- lib/gitlab/danger/helper.rb | 1 + lib/gitlab/diff/highlight_cache.rb | 19 + lib/gitlab/repository_cache_adapter.rb | 2 +- lib/gitlab/set_cache.rb | 17 +- lib/gitlab/usage_data.rb | 4 +- locale/gitlab.pot | 30 +- qa/Dockerfile | 2 +- qa/README.md | 15 +- spec/helpers/submodule_helper_spec.rb | 27 ++ spec/lib/gitlab/danger/helper_spec.rb | 1 + spec/lib/gitlab/diff/highlight_cache_spec.rb | 22 + .../gitlab/repository_cache_adapter_spec.rb | 3 +- spec/lib/gitlab/repository_set_cache_spec.rb | 48 +- .../commits/cherry_pick_service_spec.rb | 12 - .../link_merge_requests_service_spec.rb | 47 -- .../merge_requests_service_spec.rb | 2 +- 57 files changed, 1031 insertions(+), 145 deletions(-) create mode 100644 .editorconfig create mode 100644 changelogs/unreleased/208830-download-urls-conan-reference.yml create mode 100644 changelogs/unreleased/208923-enable-batch-counting-for-some-individual-queries.yml create mode 100644 changelogs/unreleased/26111-fix-github-gist-links.yml create mode 100644 changelogs/unreleased/ac-remove-track_mr_picking-ff.yml create mode 100644 changelogs/unreleased/creator-pairing-fix-alert.yml delete mode 100644 changelogs/unreleased/fix-x509-signed-commit.yml create mode 100644 changelogs/unreleased/unlink-cache-deletions.yml create mode 100644 db/migrate/20200310123229_add_index_on_enabled_and_provider_type_and_id_to_clusters.rb create mode 100644 doc/development/testing_guide/end_to_end/running_tests_that_require_special_setup.md create mode 100644 doc/user/application_security/offline_deployments/index.md create mode 100644 doc/user/clusters/img/threat_monitoring_v12_9.png create mode 100644 doc/user/project/merge_requests/img/cherry_pick_mr_timeline_v12_9.png diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000000..d704f20c726 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,15 @@ +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +end_of_line = lf +trim_trailing_whitespace = true +insert_final_newline = true + +[*.{js,json,vue,scss,rb,haml,yml}] +indent_size = 2 + +[*.{js,json,vue,scss,rb,haml,yml,md}] +indent_style = space +charset = utf-8 diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS index 06b32856e0e..28ad2b41921 100644 --- a/.gitlab/CODEOWNERS +++ b/.gitlab/CODEOWNERS @@ -56,6 +56,7 @@ Dangerfile @gl-quality/eng-prod /lib/gitlab/danger/ @gl-quality/eng-prod /scripts/ @gl-quality/eng-prod /scripts/frontend/ @gl-quality/eng-prod @gitlab-org/maintainers/frontend +.editorconfig @gl-quality/eng-prod # Telemetry owner files /ee/lib/gitlab/usage_data_counters/ @gitlab-org/growth/telemetry diff --git a/.gitlab/issue_templates/Security Release.md b/.gitlab/issue_templates/Security Release.md index a3689bff450..b06f31f0e9a 100644 --- a/.gitlab/issue_templates/Security Release.md +++ b/.gitlab/issue_templates/Security Release.md @@ -4,6 +4,10 @@ Set the title to: `Security Release: 12.2.X, 12.1.X, and 12.0.X` --> +:warning: **Only Release Managers and members of the AppSec team can edit the description of this issue** + +------- + ## Releases tasks - https://gitlab.com/gitlab-org/release/docs/blob/master/general/security/release-manager.md @@ -24,22 +28,6 @@ in the "Linked issues" section below this issue description. tracking issue, their merge requests may not be included in the security release. -## Issues in Omnibus-GitLab - -Omnibus security fixes need to be added manually to this issue description -using and below the following template: - -```markdown -* {https://gitlab.com/gitlab-org/security/gitlab/issues/ link} - -| Version | MR | -|---------|----| -| 12.2 | {https://dev.gitlab.org/gitlab/omnibus-gitlab/merge_requests/ link} | -| 12.1 | {https://dev.gitlab.org/gitlab/omnibus-gitlab/merge_requests/ link} | -| 12.0 | {https://dev.gitlab.org/gitlab/omnibus-gitlab/merge_requests/ link} | -| master | {https://dev.gitlab.org/gitlab/omnibus-gitlab/merge_requests/ link} | -``` - ## QA {QA issue link} diff --git a/CHANGELOG-EE.md b/CHANGELOG-EE.md index 0144ebde626..fe44d526d51 100644 --- a/CHANGELOG-EE.md +++ b/CHANGELOG-EE.md @@ -1,5 +1,12 @@ Please view this file on the master branch, on stable branches it's out of date. +## 12.8.7 (2020-03-16) + +### Fixed (1 change) + +- Allow multipart uploads for packages. !26387 + + ## 12.8.6 (2020-03-11) - No changes. diff --git a/CHANGELOG.md b/CHANGELOG.md index 69fb12b3a88..a75434d1ed7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,10 @@ entry. ## 12.8.7 (2020-03-16) -- No changes. +### Fixed (1 change, 1 of them is from the community) + +- Fix crl_url parsing and certificate visualization. !25876 (Roger Meier) + ## 12.8.6 (2020-03-11) diff --git a/app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue b/app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue index 59c5586edcd..aefb31fe3d5 100644 --- a/app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue +++ b/app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue @@ -1,6 +1,6 @@