Merge branch '298776-remove-merge-request-draft-filter-ff' into 'master'

Remove merge_request_draft_filter feature flag

See merge request gitlab-org/gitlab!66507

app/finders/merge_requests_finder.rb

@@ -154,16 +154,9 @@ class MergeRequestsFinder < IssuableFinder
 
   # WIP is deprecated in favor of Draft. Currently both options are supported
   def wip_match(table)
-    items =
-      table[:title].matches('WIP:%')
-        .or(table[:title].matches('WIP %'))
-        .or(table[:title].matches('[WIP]%'))
-
-    # Let's keep this FF around until https://gitlab.com/gitlab-org/gitlab/-/issues/232999
-    # is implemented
-    return items unless Feature.enabled?(:merge_request_draft_filter, default_enabled: true)
-
-    items
+    table[:title].matches('WIP:%')
+      .or(table[:title].matches('WIP %'))
+      .or(table[:title].matches('[WIP]%'))
       .or(table[:title].matches('Draft - %'))
       .or(table[:title].matches('Draft:%'))
       .or(table[:title].matches('[Draft]%'))

config/feature_flags/development/merge_request_draft_filter.yml

----
-name: merge_request_draft_filter
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35942
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/298776
-milestone: '13.3'
-type: development
-group: group::code review
-default_enabled: true

spec/finders/merge_requests_finder_spec.rb

@@ -317,18 +317,6 @@ RSpec.describe MergeRequestsFinder do
             )
           end
 
-          context 'when merge_request_draft_filter is disabled' do
-            it 'does not include draft merge requests' do
-              stub_feature_flags(merge_request_draft_filter: false)
-
-              merge_requests = described_class.new(user, { draft_param_key => 'yes' }).execute
-
-              expect(merge_requests).to contain_exactly(
-                merge_request4, merge_request5, wip_merge_request1, wip_merge_request2, wip_merge_request3, wip_merge_request4
-              )
-            end
-          end
-
           it "filters by not #{draft_param_key}" do
             params = { draft_param_key => 'no' }