.rubocop_todo/gitlab/strong_memoize_attr.yml

@@ -366,7 +366,6 @@ Gitlab/StrongMemoizeAttr:
     - 'ee/lib/ee/gitlab/analytics/cycle_analytics/stage_events.rb'
     - 'ee/lib/ee/gitlab/auth/o_auth/auth_hash.rb'
     - 'ee/lib/ee/gitlab/background_migration/migrate_approver_to_approval_rules.rb'
-    - 'ee/lib/ee/gitlab/background_migration/populate_resolved_on_default_branch_column.rb'
     - 'ee/lib/ee/gitlab/checks/base_checker.rb'
     - 'ee/lib/ee/gitlab/checks/diff_check.rb'
     - 'ee/lib/ee/gitlab/ci/matching/runner_matcher.rb'

.rubocop_todo/layout/line_length.yml

@@ -805,7 +805,6 @@ Layout/LineLength:
     - 'ee/app/models/vulnerabilities/finding.rb'
     - 'ee/app/models/vulnerabilities/finding_identifier.rb'
     - 'ee/app/models/vulnerabilities/finding_link.rb'
-    - 'ee/app/models/vulnerabilities/finding_pipeline.rb'
     - 'ee/app/models/vulnerabilities/finding_remediation.rb'
     - 'ee/app/models/vulnerabilities/flag.rb'
     - 'ee/app/models/vulnerabilities/historical_statistic.rb'
@@ -1041,7 +1040,6 @@ Layout/LineLength:
     - 'ee/lib/ee/gitlab/background_migration/create_security_setting.rb'
     - 'ee/lib/ee/gitlab/background_migration/migrate_approver_to_approval_rules.rb'
     - 'ee/lib/ee/gitlab/background_migration/populate_latest_pipeline_ids.rb'
-    - 'ee/lib/ee/gitlab/background_migration/populate_resolved_on_default_branch_column.rb'
     - 'ee/lib/ee/gitlab/checks/push_rules/commit_check.rb'
     - 'ee/lib/ee/gitlab/checks/push_rules/file_size_check.rb'
     - 'ee/lib/ee/gitlab/ci/pipeline/chain/create_cross_database_associations.rb'
@@ -2266,7 +2264,6 @@ Layout/LineLength:
     - 'lib/gitlab/background_migration/migrate_approver_to_approval_rules_in_batch.rb'
     - 'lib/gitlab/background_migration/migrate_job_artifact_registry_to_ssf.rb'
     - 'lib/gitlab/background_migration/migrate_requirements_to_work_items.rb'
-    - 'lib/gitlab/background_migration/populate_resolved_on_default_branch_column.rb'
     - 'lib/gitlab/background_migration/project_namespaces/backfill_project_namespaces.rb'
     - 'lib/gitlab/bullet/exclusions.rb'
     - 'lib/gitlab/cache/helpers.rb'

.rubocop_todo/lint/redundant_cop_disable_directive.yml

@@ -291,7 +291,6 @@ Lint/RedundantCopDisableDirective:
     - 'lib/gitlab/background_migration/migrate_vulnerabilities_feedback_to_vulnerabilities_state_transition.rb'
     - 'lib/gitlab/background_migration/populate_denormalized_columns_for_sbom_occurrences.rb'
     - 'lib/gitlab/background_migration/populate_latest_pipeline_ids.rb'
-    - 'lib/gitlab/background_migration/populate_resolved_on_default_branch_column.rb'
     - 'lib/gitlab/background_migration/populate_vulnerability_dismissal_fields.rb'
     - 'lib/gitlab/background_migration/purge_stale_security_scans.rb'
     - 'lib/gitlab/background_migration/resolve_vulnerabilities_for_removed_analyzers.rb'

.rubocop_todo/migration/background_migration_record.yml

@@ -7,7 +7,6 @@ Migration/BackgroundMigrationRecord:
     - 'ee/lib/ee/gitlab/background_migration/migrate_approver_to_approval_rules_in_batch.rb'
     - 'ee/lib/ee/gitlab/background_migration/migrate_requirements_to_work_items.rb'
     - 'ee/lib/ee/gitlab/background_migration/populate_latest_pipeline_ids.rb'
-    - 'ee/lib/ee/gitlab/background_migration/populate_resolved_on_default_branch_column.rb'
     - 'lib/gitlab/background_migration/backfill_draft_status_on_merge_requests.rb'
     - 'lib/gitlab/background_migration/backfill_project_repositories.rb'
     - 'lib/gitlab/background_migration/backfill_topics_title.rb'

.rubocop_todo/migration/batched_migration_base_class.yml

@@ -26,7 +26,6 @@ Migration/BatchedMigrationBaseClass:
     - 'lib/gitlab/background_migration/migrate_null_private_profile_to_false.rb'
     - 'lib/gitlab/background_migration/migrate_requirements_to_work_items.rb'
     - 'lib/gitlab/background_migration/populate_latest_pipeline_ids.rb'
-    - 'lib/gitlab/background_migration/populate_resolved_on_default_branch_column.rb'
     - 'lib/gitlab/background_migration/project_namespaces/backfill_project_namespaces.rb'
     - 'lib/gitlab/background_migration/project_namespaces/models/namespace.rb'
     - 'lib/gitlab/background_migration/project_namespaces/models/project.rb'

.rubocop_todo/rspec/context_wording.yml

@@ -461,7 +461,6 @@ RSpec/ContextWording:
     - 'ee/spec/models/saml_provider_spec.rb'
     - 'ee/spec/models/status_page/project_setting_spec.rb'
     - 'ee/spec/models/vulnerabilities/feedback_spec.rb'
-    - 'ee/spec/models/vulnerabilities/finding_pipeline_spec.rb'
     - 'ee/spec/models/vulnerabilities/finding_spec.rb'
     - 'ee/spec/models/vulnerabilities/statistic_spec.rb'
     - 'ee/spec/policies/app_sec/fuzzing/coverage/corpus_policy_spec.rb'

.rubocop_todo/style/inline_disable_annotation.yml

@@ -2017,7 +2017,6 @@ Style/InlineDisableAnnotation:
     - 'lib/gitlab/background_migration/migrate_shared_vulnerability_scanners.rb'
     - 'lib/gitlab/background_migration/populate_denormalized_columns_for_sbom_occurrences.rb'
     - 'lib/gitlab/background_migration/populate_latest_pipeline_ids.rb'
-    - 'lib/gitlab/background_migration/populate_resolved_on_default_branch_column.rb'
     - 'lib/gitlab/background_migration/populate_vulnerability_dismissal_fields.rb'
     - 'lib/gitlab/background_migration/project_namespaces/backfill_project_namespaces.rb'
     - 'lib/gitlab/background_migration/purge_stale_security_scans.rb'

.rubocop_todo/style/string_concatenation.yml

@@ -43,7 +43,6 @@ Style/StringConcatenation:
     - 'ee/lib/api/project_mirror.rb'
     - 'ee/lib/ee/gitlab/auth/ldap/person.rb'
     - 'ee/lib/ee/gitlab/background_migration/populate_latest_pipeline_ids.rb'
-    - 'ee/lib/ee/gitlab/background_migration/populate_resolved_on_default_branch_column.rb'
     - 'ee/lib/gitlab/geo/git_ssh_proxy.rb'
     - 'ee/lib/omni_auth/strategies/kerberos.rb'
     - 'ee/lib/tasks/gitlab/license.rake'

GITLAB_KAS_VERSION

-9db831dfcab1ec12908d895f396f1bcb18a219e7
+f08aa8cf272ffcc7bf2fa3b45cc88419ef5c21d2

app/assets/javascripts/search/results/components/status_bar.vue

@@ -113,7 +113,7 @@ export default {
         <ref-selector
           :project-id="String(projectInitialJson.id)"
           :value="repositoryRef"
-          class="gl-inline"
+          class="gl-inline-block"
           @input="handleInput"
         />
       </template>

app/assets/javascripts/todos/components/mutations/mark_all_as_done.mutation.graphql

-mutation markAllAsDone {
-  markAllAsDone: todosMarkAllDone(input: {}) {
+mutation markAllAsDone(
+  $projectId: [ID!]
+  $groupId: [ID!]
+  $authorId: [ID!]
+  $action: [TodoActionEnum!]
+  $type: [TodoTargetEnum!]
+) {
+  markAllAsDone: todosMarkAllDone(
+    input: {
+      projectId: $projectId
+      groupId: $groupId
+      authorId: $authorId
+      action: $action
+      type: $type
+    }
+  ) {
     todos {
       id
       state

app/assets/javascripts/todos/components/todos_app.vue

@@ -184,7 +184,7 @@ export default {
       </gl-tabs>
 
       <div v-if="showMarkAllAsDone" class="gl-my-3 gl-mr-5 gl-flex gl-items-center gl-justify-end">
-        <todos-mark-all-done-button @change="updateCounts" />
+        <todos-mark-all-done-button :filters="queryFilterValues" @change="updateCounts" />
       </div>
     </div>
 

app/assets/javascripts/todos/components/todos_mark_all_done_button.vue

@@ -10,6 +10,13 @@ export default {
   components: {
     GlButton,
   },
+  props: {
+    filters: {
+      type: Object,
+      required: false,
+      default: () => ({}),
+    },
+  },
   data() {
     return {
       isLoading: false,
@@ -36,6 +43,7 @@ export default {
       return this.performMutation(async () => {
         const resp = await this.$apollo.mutate({
           mutation: markAllAsDoneMutation,
+          variables: this.filters,
         });
         const data = resp.data.markAllAsDone;
 

app/controllers/projects/settings/repository_controller.rb

@@ -19,6 +19,7 @@ class RepositoryController < Projects::ApplicationController
       urgency :low, [:show, :create_deploy_token]
 
       def show
+        Gitlab::QueryLimiting.disable!('https://gitlab.com/gitlab-org/gitlab/-/issues/482942')
         render_show
       end
 

app/graphql/mutations/todos/mark_all_done.rb

@@ -15,6 +15,26 @@ class MarkAllDone < ::Mutations::BaseMutation
                description: "Global ID of the to-do item's parent. Issues, merge requests, designs, and epics are supported. " \
                  "If argument is omitted, all pending to-do items of the current user are marked as done."
 
+      argument :author_id, [GraphQL::Types::ID],
+        required: false,
+        description: 'ID of an author.'
+
+      argument :project_id, [GraphQL::Types::ID],
+        required: false,
+        description: 'ID of a project.'
+
+      argument :group_id, [GraphQL::Types::ID],
+        required: false,
+        description: 'ID of a group.'
+
+      argument :action, [Types::TodoActionEnum],
+        required: false,
+        description: 'Action to be filtered.'
+
+      argument :type, [Types::TodoTargetEnum],
+        required: false,
+        description: 'Type of the todo.'
+
       field :todos, [::Types::TodoType],
             null: false,
             description: 'Updated to-do items.'
@@ -35,7 +55,7 @@ def resolve(**args)
       def mark_all_todos_done(**args)
         return [] unless current_user
 
-        finder_params = { state: :pending }
+        finder_params = todo_finder_params(args)
 
         if args[:target_id].present?
           target = Gitlab::Graphql::Lazy.force(
@@ -54,6 +74,17 @@ def mark_all_todos_done(**args)
 
         TodoService.new.resolve_todos(todos, current_user, resolved_by_action: :api_all_done)
       end
+
+      def todo_finder_params(args)
+        {
+          state: :pending,
+          type: args[:type],
+          group_id: args[:group_id],
+          author_id: args[:author_id],
+          action_id: args[:action],
+          project_id: args[:project_id]
+        }
+      end
     end
   end
 end

app/models/integrations/jira_cloud_app.rb

@@ -78,15 +78,6 @@ def self.supported_events
       []
     end
 
-    override :fields
-    def fields
-      return super if Feature.enabled?(:enable_jira_cloud_deployment_gating) # rubocop:disable Gitlab/FeatureFlagWithoutActor -- flag must be global
-
-      super.reject do |field|
-        field[:name].include?('deployment_gating')
-      end
-    end
-
     def sections
       [
         {
@@ -136,7 +127,6 @@ def format_deployment_gating_environments
     end
 
     def validate_deployment_gating_environments
-      return unless Feature.enabled?(:enable_jira_cloud_deployment_gating) # rubocop:disable Gitlab/FeatureFlagWithoutActor -- flag must be global
       return unless jira_cloud_app_deployment_gating_environments.present?
 
       return if jira_cloud_app_deployment_gating_environments.split(',').all? do |env|
@@ -153,7 +143,6 @@ def validate_deployment_gating_environments
     end
 
     def validate_valid_deployment_gating_input
-      return unless Feature.enabled?(:enable_jira_cloud_deployment_gating) # rubocop:disable Gitlab/FeatureFlagWithoutActor -- flag must be global
       return unless jira_cloud_app_enable_deployment_gating
       return if jira_cloud_app_deployment_gating_environments.present?
 

app/views/search/_results_list.html.haml

 .advanced-search-promote
   = render_if_exists 'shared/promotions/promote_advanced_search'
 
-- if @timeout
+- if should_show_zoekt_results?(@scope, @search_type)
+  %ul#js-search-zoekt-blob-results
+- elsif @timeout
   = render partial: "search/results/timeout"
 - elsif @search_results.respond_to?(:failed?) && @search_results.failed?(@scope)
   = render partial: "search/results/error"
@@ -13,8 +15,6 @@
       %ul.content-list.commit-list
         - @search_objects.each_with_index do |commit, index|
           = render partial: "search/results/commit", locals: { commit: commit, index: index }
-    - elsif should_show_zoekt_results?(@scope, @search_type)
-      %ul#js-search-zoekt-blob-results
     - else
       .search-results.js-search-results
         - if @scope == 'projects'

config/feature_flags/wip/enable_jira_cloud_deployment_gating.yml

----
-name: enable_jira_cloud_deployment_gating
-feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/473774
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/160155
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/474542
-milestone: '17.3'
-group: group::environments
-type: wip
-default_enabled: false

config/gitlab_loose_foreign_keys.yml

@@ -657,10 +657,6 @@ vulnerability_namespace_historical_statistics:
   - table: namespaces
     column: namespace_id
     on_delete: async_delete
-vulnerability_occurrence_pipelines:
-  - table: ci_pipelines
-    column: pipeline_id
-    on_delete: async_delete
 vulnerability_occurrences:
   - table: ci_pipelines
     column: initial_pipeline_id

config/metrics/counts_7d/20230509085219_i_quickactions_blocked_by_weekly.yml

@@ -17,4 +17,5 @@ performance_indicator_type: []
 distribution:
 - ee
 tier:
-- starter
+- premium
+- ultimate