From 60eaf3d90650086dedb6fd94d6169dc5ab1f8d1e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 12 Aug 2022 18:11:09 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- GITLAB_KAS_VERSION | 2 +- Gemfile | 6 +- Gemfile.lock | 20 +- .../components/work_item_actions.vue | 55 +++++- .../components/work_item_detail.vue | 79 +++++++- .../work_item_links/work_item_links.vue | 15 +- .../graphql/work_item.fragment.graphql | 2 + .../graphql/work_item_links.query.graphql | 1 + app/graphql/mutations/ci/job/retry.rb | 11 +- app/graphql/types/ci/job_type.rb | 2 +- app/graphql/types/ci/variable_input_type.rb | 13 ++ app/models/ci/build.rb | 11 ++ app/models/ci/job_artifact.rb | 3 +- app/models/ci/processable.rb | 2 +- app/models/container_repository.rb | 42 +++++ app/services/ci/retry_job_service.rb | 12 +- doc/.vale/gitlab/Admin.yml | 2 +- doc/.vale/gitlab/BadPlurals.yml | 2 +- doc/.vale/gitlab/EOLWhitespace.yml | 2 +- doc/.vale/gitlab/FutureTense.yml | 2 +- doc/.vale/gitlab/HeadingContent.yml | 2 +- doc/.vale/gitlab/OutdatedVersions.yml | 2 +- doc/.vale/gitlab/Possessive.yml | 2 +- doc/api/graphql/reference/index.md | 32 ++-- doc/ci/cloud_services/aws/index.md | 6 +- doc/ci/runners/configure_runners.md | 20 ++ doc/ci/runners/img/build_isolation.png | Bin 0 -> 35301 bytes doc/ci/runners/index.md | 24 ++- lib/container_registry/gitlab_api_client.rb | 23 +++ lib/container_registry/tag.rb | 15 +- lib/gitlab/ci/parsers.rb | 3 +- lib/gitlab/ci/parsers/sbom/cyclonedx.rb | 10 +- lib/gitlab/ci/reports/sbom/reports.rb | 21 +++ lib/gitlab/utils/link_header_parser.rb | 46 +++++ locale/gitlab.pot | 17 +- results.txt | 0 spec/features/issues/issue_sidebar_spec.rb | 6 +- spec/features/issues/user_edits_issue_spec.rb | 2 +- .../components/work_item_actions_spec.js | 87 +++++++-- .../work_item_links/work_item_links_spec.js | 8 + spec/frontend/work_items/mock_data.js | 36 +++- .../work_items/pages/work_item_detail_spec.js | 169 ++++++++++++++++- .../types/ci/variable_input_type_spec.rb | 11 ++ .../gitlab_api_client_spec.rb | 125 ++++++++++++ spec/lib/container_registry/tag_spec.rb | 35 ++++ .../gitlab/ci/parsers/sbom/cyclonedx_spec.rb | 2 +- .../gitlab/ci/reports/sbom/reports_spec.rb | 21 +++ .../gitlab/utils/link_header_parser_spec.rb | 75 ++++++++ spec/models/ci/build_spec.rb | 54 ++++++ spec/models/container_repository_spec.rb | 178 ++++++++++++++++++ .../api/graphql/ci/manual_variables_spec.rb | 8 +- .../graphql/mutations/ci/job_retry_spec.rb | 32 ++++ spec/services/ci/retry_job_service_spec.rb | 61 ++++++ 53 files changed, 1300 insertions(+), 117 deletions(-) create mode 100644 app/graphql/types/ci/variable_input_type.rb create mode 100644 doc/ci/runners/img/build_isolation.png create mode 100644 lib/gitlab/ci/reports/sbom/reports.rb create mode 100644 lib/gitlab/utils/link_header_parser.rb create mode 100644 results.txt create mode 100644 spec/graphql/types/ci/variable_input_type_spec.rb create mode 100644 spec/lib/gitlab/ci/reports/sbom/reports_spec.rb create mode 100644 spec/lib/gitlab/utils/link_header_parser_spec.rb diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION index 6c43fc8aefc..5ff58dbcd68 100644 --- a/GITLAB_KAS_VERSION +++ b/GITLAB_KAS_VERSION @@ -1 +1 @@ -15.2.0 +15.3.0 diff --git a/Gemfile b/Gemfile index eb1018cc70c..e8cdf812b9c 100644 --- a/Gemfile +++ b/Gemfile @@ -495,9 +495,9 @@ gem 'google-protobuf', '~> 3.21' gem 'toml-rb', '~> 2.0' # Feature toggles -gem 'flipper', '~> 0.21.0' -gem 'flipper-active_record', '~> 0.21.0' -gem 'flipper-active_support_cache_store', '~> 0.21.0' +gem 'flipper', '~> 0.25.0' +gem 'flipper-active_record', '~> 0.25.0' +gem 'flipper-active_support_cache_store', '~> 0.25.0' gem 'unleash', '~> 3.2.2' gem 'gitlab-experiment', '~> 0.7.1' diff --git a/Gemfile.lock b/Gemfile.lock index 1190dd4bf8c..3b8bdd23647 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -438,13 +438,13 @@ GEM libyajl2 (~> 1.2) filelock (1.1.1) find_a_port (1.0.1) - flipper (0.21.0) - flipper-active_record (0.21.0) - activerecord (>= 5.0, < 7) - flipper (~> 0.21.0) - flipper-active_support_cache_store (0.21.0) - activesupport (>= 5.0, < 7) - flipper (~> 0.21.0) + flipper (0.25.0) + flipper-active_record (0.25.0) + activerecord (>= 4.2, < 8) + flipper (~> 0.25.0) + flipper-active_support_cache_store (0.25.0) + activesupport (>= 4.2, < 8) + flipper (~> 0.25.0) flowdock (0.7.1) httparty (~> 0.7) multi_json @@ -1557,9 +1557,9 @@ DEPENDENCIES faraday_middleware-aws-sigv4 (~> 0.3.0) fast_blank ffaker (~> 2.10) - flipper (~> 0.21.0) - flipper-active_record (~> 0.21.0) - flipper-active_support_cache_store (~> 0.21.0) + flipper (~> 0.25.0) + flipper-active_record (~> 0.25.0) + flipper-active_support_cache_store (~> 0.25.0) flowdock (~> 0.7) fog-aliyun (~> 0.3) fog-aws (~> 3.14) diff --git a/app/assets/javascripts/work_items/components/work_item_actions.vue b/app/assets/javascripts/work_items/components/work_item_actions.vue index 77002eeaf55..2130eb4b729 100644 --- a/app/assets/javascripts/work_items/components/work_item_actions.vue +++ b/app/assets/javascripts/work_items/components/work_item_actions.vue @@ -1,15 +1,24 @@