From 4a721269429a178957e8ce7c6d0a75d3307c9830 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 19 Jul 2021 15:09:40 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../Quarantine End to End Test.md | 2 +- .../components/graph/graph_component.vue | 6 +- .../base_security_analyzer.rb | 44 +++ .../ci_configuration/configure_sast.rb | 33 +-- .../configure_secret_detection.rb | 33 +-- app/graphql/types/base_field.rb | 10 +- .../groups/settings/_pages_settings.html.haml | 2 +- .../nav/sidebar/_group_scope_menu.html.haml | 6 - .../projects/_new_project_fields.html.haml | 2 +- .../projects/default_branch/_show.html.haml | 4 +- .../projects/pages/_pages_settings.html.haml | 7 +- config/routes/project.rb | 6 - doc/administration/pages/index.md | 19 +- doc/api/graphql/reference/index.md | 16 +- .../end_to_end/environment_selection.md | 89 +----- .../end_to_end/execution_context_selection.md | 122 +++++++++ .../testing_guide/end_to_end/index.md | 1 + .../end_to_end/rspec_metadata_tests.md | 6 +- doc/development/usage_ping/dictionary.md | 2 +- .../admin_area/analytics/dev_ops_report.md | 1 - doc/user/clusters/agent/index.md | 14 +- doc/user/group/devops_adoption/index.md | 1 - doc/user/project/time_tracking.md | 59 ++-- lib/sidebars/groups/menus/scope_menu.rb | 34 +++ lib/sidebars/groups/panel.rb | 6 +- locale/gitlab.pot | 14 +- qa/qa.rb | 3 + qa/qa/page/project/import/repo_by_url.rb | 60 +++++ qa/qa/page/project/new.rb | 4 + qa/qa/page/project/settings/default_branch.rb | 29 ++ qa/qa/page/project/settings/repository.rb | 8 + qa/qa/resource/project_imported_from_url.rb | 27 ++ .../2_plan/issue/create_issue_spec.rb | 2 +- .../online_garbage_collection_spec.rb | 108 ++++++++ qa/qa/specs/helpers/context_selector.rb | 16 +- .../specs/helpers/context_selector_spec.rb | 253 +++++++++++++++--- .../base_security_analyzer_spec.rb | 14 + spec/graphql/types/base_field_spec.rb | 44 ++- spec/routing/project_routing_spec.rb | 10 - .../cluster_management.tar.gz | Bin 12723 -> 12981 bytes 40 files changed, 815 insertions(+), 302 deletions(-) create mode 100644 app/graphql/mutations/security/ci_configuration/base_security_analyzer.rb delete mode 100644 app/views/layouts/nav/sidebar/_group_scope_menu.html.haml create mode 100644 doc/development/testing_guide/end_to_end/execution_context_selection.md create mode 100644 lib/sidebars/groups/menus/scope_menu.rb create mode 100644 qa/qa/page/project/import/repo_by_url.rb create mode 100644 qa/qa/page/project/settings/default_branch.rb create mode 100644 qa/qa/resource/project_imported_from_url.rb create mode 100644 qa/qa/specs/features/browser_ui/5_package/online_garbage_collection_spec.rb create mode 100644 spec/graphql/mutations/security/ci_configuration/base_security_analyzer_spec.rb diff --git a/.gitlab/merge_request_templates/Quarantine End to End Test.md b/.gitlab/merge_request_templates/Quarantine End to End Test.md index 5794a62df96..772167af3e9 100644 --- a/.gitlab/merge_request_templates/Quarantine End to End Test.md +++ b/.gitlab/merge_request_templates/Quarantine End to End Test.md @@ -21,7 +21,7 @@ the noise (due to constantly failing tests, flaky tests, and so on) so that new - [ ] Quarantine test check-list - [ ] Follow the [Quarantining Tests guide](https://about.gitlab.com/handbook/engineering/quality/guidelines/debugging-qa-test-failures/#quarantining-tests). - [ ] Confirm the test has a [`quarantine:` tag with the specified quarantine type](https://about.gitlab.com/handbook/engineering/quality/guidelines/debugging-qa-test-failures/#quarantined-test-types). - - [ ] Note if the test should be [quarantined for a specific environment](https://docs.gitlab.com/ee/development/testing_guide/end_to_end/environment_selection.html#quarantining-a-test-for-a-specific-environment). + - [ ] Note if the test should be [quarantined for a specific environment](https://docs.gitlab.com/ee/development/testing_guide/end_to_end/execution_context_selection.html#quarantine-a-test-for-a-specific-environment). - [ ] Dequarantine test check-list - [ ] Follow the [Dequarantining Tests guide](https://about.gitlab.com/handbook/engineering/quality/guidelines/debugging-qa-test-failures/#dequarantining-tests). - [ ] Confirm the test consistently passes on the target GitLab environment(s). diff --git a/app/assets/javascripts/pipelines/components/graph/graph_component.vue b/app/assets/javascripts/pipelines/components/graph/graph_component.vue index ff081552ef2..ea45b5e3ec7 100644 --- a/app/assets/javascripts/pipelines/components/graph/graph_component.vue +++ b/app/assets/javascripts/pipelines/components/graph/graph_component.vue @@ -162,8 +162,10 @@ export default {