diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 3dc3423f134..6127f543d61 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -e3aa6272e47af528b7599f93db2b02c76c55718e +4181f9518f5a56298d6875a0fd4da1e72dabcb9f diff --git a/app/models/project.rb b/app/models/project.rb index 16b85a6835e..a215ff2a878 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -602,6 +602,7 @@ class Project < ApplicationRecord scope :inc_routes, -> { includes(:route, namespace: :route) } scope :with_statistics, -> { includes(:statistics) } scope :with_namespace, -> { includes(:namespace) } + scope :with_group, -> { includes(:group) } scope :with_import_state, -> { includes(:import_state) } scope :include_project_feature, -> { includes(:project_feature) } scope :include_integration, -> (integration_association_name) { includes(integration_association_name) } diff --git a/data/deprecations/15-3-deprecation-vulnerability-report-tool-sort.yml b/data/deprecations/15-3-deprecation-vulnerability-report-tool-sort.yml new file mode 100644 index 00000000000..326070667f2 --- /dev/null +++ b/data/deprecations/15-3-deprecation-vulnerability-report-tool-sort.yml @@ -0,0 +1,19 @@ +- name: "Vulnerability Report sort by Tool" # (required) The name of the feature to be deprecated + announcement_milestone: "15.1" # (required) The milestone when this feature was first announced as deprecated. + announcement_date: "2022-06-22" # (required) The date of the milestone release when this feature was first announced as deprecated. This should almost always be the 22nd of a month (YYYY-MM-22), unless you did an out of band blog post. + removal_milestone: "15.3" # (required) The milestone when this feature is planned to be removed + removal_date: "2022-08-22" # (required) The date of the milestone release when this feature is planned to be removed. This should almost always be the 22nd of a month (YYYY-MM-22), unless you did an out of band blog post. + breaking_change: false # (required) If this deprecation is a breaking change, set this value to true + reporter: matt_wilson # (required) GitLab username of the person reporting the deprecation + stage: Secure # (required) String value of the stage that the feature was created in. e.g., Growth + issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/362962 # (required) Link to the deprecation issue in GitLab + body: | # (required) Do not modify this line, instead modify the lines below. + The ability to sort the Vulnerability Report by the `Tool` column (scan type) was disabled and put behind a feature flag in GitLab 14.10 due to a refactor + of the underlying data model. The feature flag has remained off by default as further refactoring will be required to ensure sorting + by this value remains performant. Due to very low usage of the `Tool` column for sorting, the feature flag will instead be removed in + GitLab 15.3 to simplify the codebase and prevent any unwanted performance degradation. +# The following items are not published on the docs page, but may be used in the future. + tiers: Ultimate # (optional - may be required in the future) An array of tiers that the feature is available in currently. e.g., [Free, Silver, Gold, Core, Premium, Ultimate] + documentation_url: # (optional) This is a link to the current documentation page + image_url: # (optional) This is a link to a thumbnail image depicting the feature + video_url: # (optional) Use the youtube thumbnail URL with the structure of https://img.youtube.com/vi/UNIQUEID/hqdefault.jpg diff --git a/data/removals/templates/_removal_template.md.erb b/data/removals/templates/_removal_template.md.erb index d275ac13623..8bee1d69e42 100644 --- a/data/removals/templates/_removal_template.md.erb +++ b/data/removals/templates/_removal_template.md.erb @@ -6,6 +6,9 @@ info: "See the Technical Writers assigned to Development Guidelines: https://abo # Removals by version +In each release, GitLab removes features that were deprecated in an earlier release. +Some features cause breaking changes when they are removed. + <% if milestones.any? -%> <%- milestones.each do |milestone| %> -## <%= milestone %> +## Removed in <%= milestone %> <%- entries.select{|entry| entry["removal_milestone"] == milestone}.each do |removal| %> ### <%= removal["name"]%> <% if removal["breaking_change"] -%> diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md index 3b4d8f8975b..73f1d3752fe 100644 --- a/doc/update/deprecations.md +++ b/doc/update/deprecations.md @@ -60,6 +60,19 @@ Review the details carefully before upgrading. The `maintainer_note` argument in the `POST /runners` REST endpoint was deprecated in GitLab 14.8 and replaced with the `maintenance_note` argument. The `maintainer_note` argument will be removed in GitLab 16.0. + + +