From 5169b4a63b1e592e159b5451f81bc3c11602275f Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 26 Oct 2021 15:09:27 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../Productivity Improvement.md | 2 +- .../Pipeline Configuration.md | 2 +- GITALY_SERVER_VERSION | 2 +- .../blob/components/blob_content.vue | 2 +- .../blob/components/blob_header.vue | 15 ++- .../blob/components/table_contents.vue | 5 +- .../groups/components/item_caret.vue | 2 +- .../issue_show/components/header_actions.vue | 7 +- .../nav/components/responsive_home.vue | 1 + .../nav/components/top_nav_new_dropdown.vue | 1 + .../components/extensions/base.vue | 2 +- .../vue_shared/components/file_icon.vue | 2 +- app/graphql/mutations/issues/create.rb | 9 +- app/models/ci/pipeline.rb | 81 +++++++------ app/models/project.rb | 18 +-- app/views/layouts/header/_default.html.haml | 2 +- app/views/layouts/nav/_breadcrumbs.html.haml | 2 +- app/views/projects/blob/_header.html.haml | 2 +- danger/pipeline/Dangerfile | 2 +- doc/development/index.md | 2 +- ...unning_tests_that_require_special_setup.md | 106 ++++++++++++++++++ .../dependency_scanning/index.md | 4 +- doc/user/clusters/agent/index.md | 2 +- qa/qa/flow/login.rb | 7 +- qa/qa/mobile/page/main/menu.rb | 60 ++++++++++ qa/qa/mobile/page/profile/menu.rb | 26 +++++ qa/qa/mobile/page/project/issue/show.rb | 37 ++++++ qa/qa/mobile/page/project/show.rb | 31 +++++ qa/qa/mobile/page/sub_menus/common.rb | 28 +++++ qa/qa/page/main/login.rb | 6 + qa/qa/page/main/menu.rb | 18 ++- qa/qa/page/profile/menu.rb | 4 + qa/qa/page/project/issue/show.rb | 5 + qa/qa/page/project/show.rb | 3 +- qa/qa/page/project/sub_menus/common.rb | 4 + qa/qa/page/sub_menus/common.rb | 4 + qa/qa/runtime/browser.rb | 3 + qa/qa/runtime/env.rb | 6 + .../browser_ui/1_manage/login/log_in_spec.rb | 2 +- .../2_plan/issue/create_issue_spec.rb | 6 +- scripts/rspec_helpers.sh | 4 +- .../__snapshots__/blob_header_spec.js.snap | 14 ++- .../blob/components/blob_header_spec.js | 2 + .../blob/components/table_contents_spec.js | 22 +++- .../graphql/mutations/issues/create_spec.rb | 4 + .../ci/create_pipeline_service_spec.rb | 4 +- ...ping_metrics_definitions_shared_context.rb | 5 + 47 files changed, 486 insertions(+), 92 deletions(-) create mode 100644 qa/qa/mobile/page/main/menu.rb create mode 100644 qa/qa/mobile/page/profile/menu.rb create mode 100644 qa/qa/mobile/page/project/issue/show.rb create mode 100644 qa/qa/mobile/page/project/show.rb create mode 100644 qa/qa/mobile/page/sub_menus/common.rb diff --git a/.gitlab/issue_templates/Productivity Improvement.md b/.gitlab/issue_templates/Productivity Improvement.md index 06692d3ede8..040d8ea2f89 100644 --- a/.gitlab/issue_templates/Productivity Improvement.md +++ b/.gitlab/issue_templates/Productivity Improvement.md @@ -2,7 +2,7 @@ ### Problem identification checklist diff --git a/.gitlab/merge_request_templates/Pipeline Configuration.md b/.gitlab/merge_request_templates/Pipeline Configuration.md index 920abf086cb..083992bff92 100644 --- a/.gitlab/merge_request_templates/Pipeline Configuration.md +++ b/.gitlab/merge_request_templates/Pipeline Configuration.md @@ -33,6 +33,6 @@ This will help keep track of expected cost increases to the [GitLab project aver ### Post-merge -- [ ] Consider communicating these changes to the broader team following the [communication guideline for pipeline changes](https://about.gitlab.com/handbook/engineering/quality/engineering-productivity-team/#pipeline-changes) +- [ ] Consider communicating these changes to the broader team following the [communication guideline for pipeline changes](https://about.gitlab.com/handbook/engineering/quality/engineering-productivity/#pipeline-changes) /label ~tooling ~"tooling::pipelines" ~"Engineering Productivity" diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 05f9d7573ba..243f3a70c19 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -ee4b20cc318876c4b237e277fefd9d75186a085c +156e65d1de93e779091a0915cf77b2aefa85fadf diff --git a/app/assets/javascripts/blob/components/blob_content.vue b/app/assets/javascripts/blob/components/blob_content.vue index 213e026c41f..e3e43ea3a0e 100644 --- a/app/assets/javascripts/blob/components/blob_content.vue +++ b/app/assets/javascripts/blob/components/blob_content.vue @@ -65,7 +65,7 @@ export default { };