Commit c4047be6 authored by Stan Hu's avatar Stan Hu

Merge branch 'philipcunningham-cleanup-dast-disable-joins-336944' into 'master'

Remove feature flags for DAST disable_joins

See merge request gitlab-org/gitlab!68440
parents 54185a48 2fd44466
---
name: dast_profile_disable_joins
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66709
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336944
milestone: '14.2'
type: development
group: group::dynamic analysis
default_enabled: true
---
name: dast_scanner_profile_disable_joins
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66709
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336946
milestone: '14.2'
type: development
group: group::dynamic analysis
default_enabled: true
---
name: dast_site_profile_disable_joins
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66709
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336945
milestone: '14.2'
type: development
group: group::dynamic analysis
default_enabled: true
......@@ -33,10 +33,10 @@ module EE
has_many :security_scans, class_name: 'Security::Scan'
has_one :dast_site_profiles_build, class_name: 'Dast::SiteProfilesBuild', foreign_key: :ci_build_id
has_one :dast_site_profile, class_name: 'DastSiteProfile', through: :dast_site_profiles_build, disable_joins: -> { ::Feature.enabled?(:dast_site_profile_disable_joins, default_enabled: :yaml) }
has_one :dast_site_profile, class_name: 'DastSiteProfile', through: :dast_site_profiles_build, disable_joins: true
has_one :dast_scanner_profiles_build, class_name: 'Dast::ScannerProfilesBuild', foreign_key: :ci_build_id
has_one :dast_scanner_profile, class_name: 'DastScannerProfile', through: :dast_scanner_profiles_build, disable_joins: -> { ::Feature.enabled?(:dast_scanner_profile_disable_joins, default_enabled: :yaml) }
has_one :dast_scanner_profile, class_name: 'DastScannerProfile', through: :dast_scanner_profiles_build, disable_joins: true
after_commit :track_ci_secrets_management_usage, on: :create
delegate :service_specification, to: :runner_session, allow_nil: true
......
......@@ -21,7 +21,7 @@ module EE
has_many :security_findings, class_name: 'Security::Finding', through: :security_scans, source: :findings
has_one :dast_profiles_pipeline, class_name: 'Dast::ProfilesPipeline', foreign_key: :ci_pipeline_id
has_one :dast_profile, class_name: 'Dast::Profile', through: :dast_profiles_pipeline, disable_joins: -> { ::Feature.enabled?(:dast_profile_disable_joins, default_enabled: :yaml) }
has_one :dast_profile, class_name: 'Dast::Profile', through: :dast_profiles_pipeline, disable_joins: true
has_one :source_project, class_name: 'Ci::Sources::Project', foreign_key: :pipeline_id
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment