Automatic merge of gitlab-org/gitlab master

config/feature_flags/development/dast_profile_disable_joins.yml

----
-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

config/feature_flags/development/dast_scanner_profile_disable_joins.yml

----
-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

config/feature_flags/development/dast_site_profile_disable_joins.yml

----
-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

doc/ci/migration/circleci.md

@@ -121,11 +121,11 @@ stages:
   - test
   - deploy
 
-job 1:
+job1:
   stage: build
   script: make build dependencies
 
-job 2:
+job2:
   stage: build
   script: make build artifacts
 
@@ -216,12 +216,12 @@ jobs:
 Example of the same workflow using `rules` in GitLab CI/CD:
 
 ```yaml
-deploy_prod:
+deploy:
   stage: deploy
   script:
-    - echo "Deploy to production server"
+    - echo "Deploy job"
   rules:
-    - if: '$CI_COMMIT_BRANCH == "main"'
+    - if: '$CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH =~ /^rc-/'
 ```
 
 ### Caching

ee/app/models/ee/ci/build.rb

@@ -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

ee/app/models/ee/ci/pipeline.rb

@@ -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
 

ee/spec/requests/api/graphql/merge_requests/approval_state_spec.rb

@@ -103,7 +103,7 @@ RSpec.describe 'Query.project.mergeRequest.approvalState' do
             'eligibleApprovers' => [{ 'id' => global_id_of(user) }],
             'groups' => { 'nodes' => [] },
             'id' => global_id_of(code_owner_rule),
-            'name' => '*-1.js',
+            'name' => code_owner_rule.name,
             'overridden' => false,
             'section' => 'codeowners',
             'sourceRule' => nil,