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. + + +
+ +### Vulnerability Report sort by Tool + +Planned removal: GitLab 15.3 (2022-08-22) + +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. +
diff --git a/doc/update/removals.md b/doc/update/removals.md index 0759f5c7884..299d1b4c341 100644 --- a/doc/update/removals.md +++ b/doc/update/removals.md @@ -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. + -## 15.0 +## Removed in 15.0 ### API: `stale` status returned instead of `offline` or `not_connected` @@ -622,7 +625,7 @@ We are removing bundler-audit from Dependency Scanning on May 22, 2022 in 15.0. If you have explicitly excluded bundler-audit using the `DS_EXCLUDED_ANALYZERS` variable, then you will be able to remove the reference to bundler-audit. If you have customized your pipeline’s Dependency Scanning configuration related to the `bundler-audit-dependency_scanning` job, then you will want to switch to `gemnasium-dependency_scanning`. If you have not used the `DS_EXCLUDED_ANALYZERS` to reference bundler-audit or customized your template specifically for bundler-audit, you will not need to take any action. -## 14.10 +## Removed in 14.10 ### Permissions change for downloading Composer dependencies @@ -634,7 +637,7 @@ The GitLab Composer repository can be used to push, search, fetch metadata about Downloading Composer dependencies without authentication is deprecated in GitLab 14.9, and will be removed in GitLab 15.0. Starting with GitLab 15.0, you must authenticate to download Composer dependencies. -## 14.9 +## Removed in 14.9 ### Integrated error tracking disabled by default @@ -646,7 +649,7 @@ In GitLab 14.4, GitLab released an integrated error tracking backend that replac For additional background on this removal, please reference [Disable Integrated Error Tracking by Default](https://gitlab.com/groups/gitlab-org/-/epics/7580). If you have feedback please add a comment to [Feedback: Removal of Integrated Error Tracking](https://gitlab.com/gitlab-org/gitlab/-/issues/355493). -## 14.6 +## Removed in 14.6 ### Limit the number of triggered pipeline to 25K in free tier @@ -656,7 +659,7 @@ A large amount of triggered pipelines in a single project impacts the performanc The [release-cli](https://gitlab.com/gitlab-org/release-cli) will be released as a [generic package](https://gitlab.com/gitlab-org/release-cli/-/packages) starting in GitLab 14.2. We will continue to deploy it as a binary to S3 until GitLab 14.5 and stop distributing it in S3 in GitLab 14.6. -## 14.3 +## Removed in 14.3 ### Introduced limit of 50 tags for jobs @@ -672,14 +675,14 @@ The support for [`gitlab_pages['use_legacy_storage']` setting](https://docs.gitl In 14.0 we removed [`domain_config_source`](https://docs.gitlab.com/ee/administration/pages/index.html#domain-source-configuration-before-140) which had been previously deprecated, and allowed users to specify disk storage. In 14.0 we added `use_legacy_storage` as a **temporary** flag to unblock upgrades, and allow us to debug issues with our users and it was deprecated and communicated for removal in 14.3. -## 14.2 +## Removed in 14.2 ### Max job log file size of 100 MB GitLab values efficiency for all users in our wider community of contributors, so we're always working hard to make sure the application performs at a high level with a lovable UX. In GitLab 14.2, we have introduced a [job log file size limit](https://docs.gitlab.com/ee/administration/instance_limits.html#maximum-file-size-for-job-logs), set to 100 megabytes by default. Administrators of self-managed GitLab instances can customize this to any value. All jobs that exceed this limit are dropped and marked as failed, helping prevent performance impacts or over-use of resources. This ensures that everyone using GitLab has the best possible experience. -## 14.1 +## Removed in 14.1 ### Remove support for `prometheus.listen_address` and `prometheus.enable` @@ -705,7 +708,7 @@ The minimum supported browser versions are: - Chromium 84. - Microsoft Edge 84. -## 14.0 +## Removed in 14.0 ### Auto Deploy CI template v1