diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-08 12:12:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-08 12:12:05 +0300 |
| commit | d59bc6c73d927d63d04f86f8b1d2e471787d48d1 (patch) | |
| tree | 205daf86ac4049e30479a521a24f3242ff326a7a /lib | |
| parent | 80abbcbeaf4b0c47a8fe6201bd5e2d9c8af6e272 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/helpers/integrations_helpers.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/cleanup/project_uploads.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/api/helpers/integrations_helpers.rb b/lib/api/helpers/integrations_helpers.rb index d9696a33e84..c5bbe0f7c1e 100644 --- a/lib/api/helpers/integrations_helpers.rb +++ b/lib/api/helpers/integrations_helpers.rb @@ -217,6 +217,7 @@ module API desc: 'Custom tags in Datadog. Specify one tag per line in the format: "key:value\nkey2:value2"' } ], + 'diffblue-cover' => ::Integrations::DiffblueCover.api_fields, 'discord' => [ ::Integrations::Discord.api_fields, chat_notification_flags, @@ -681,6 +682,7 @@ module API ::Integrations::Confluence, ::Integrations::CustomIssueTracker, ::Integrations::Datadog, + ::Integrations::DiffblueCover, ::Integrations::Discord, ::Integrations::DroneCi, ::Integrations::EmailsOnPush, diff --git a/lib/gitlab/cleanup/project_uploads.rb b/lib/gitlab/cleanup/project_uploads.rb index 918f723cd60..7c376893156 100644 --- a/lib/gitlab/cleanup/project_uploads.rb +++ b/lib/gitlab/cleanup/project_uploads.rb @@ -122,7 +122,7 @@ module Gitlab # rubocop: disable CodeReuse/ActiveRecord def project_id - @project_id ||= Project.where_full_path_in([full_path], use_includes: false).pluck(:id) + @project_id ||= Project.where_full_path_in([full_path], preload_routes: false).pluck(:id) end # rubocop: enable CodeReuse/ActiveRecord end |