Change feature flag to approval_rules

Apply project scope

It is now wished for the feature to be disabled by default.
Since we can't control when the background migration finishes,
which would set the old flag to true,
changing the flag is easier to work around with.

ee/app/models/concerns/approvable_for_rule.rb

@@ -15,14 +15,14 @@ module ApprovableForRule
 
   FORWARDABLE_METHODS.each do |method|
     define_method(method) do |*args|
-      return super(*args) if ::Feature.disabled?(:approval_rule)
+      return super(*args) if ::Feature.disabled?(:approval_rules, project)
 
       approval_state.public_send(method, *args) # rubocop:disable GitlabSecurity/PublicSend
     end
   end
 
   def approvers_overwritten?
-    return super if ::Feature.disabled?(:approval_rule)
+    return super if ::Feature.disabled?(:approval_rules, project)
 
     approval_state.approval_rules_overwritten?
   end

ee/app/models/concerns/visible_approvable_for_rule.rb

@@ -4,13 +4,13 @@
 # that include the Approvable concern
 module VisibleApprovableForRule
   def approvers_left
-    return super if ::Feature.disabled?(:approval_rule)
+    return super if ::Feature.disabled?(:approval_rules, project)
 
     approval_state.unactioned_approvers
   end
 
   def overall_approvers(exclude_code_owners: false)
-    return super if ::Feature.disabled?(:approval_rule)
+    return super if ::Feature.disabled?(:approval_rules, project)
 
     options = { target: :users }
     options[:code_owner] = false if exclude_code_owners
@@ -21,13 +21,13 @@ module VisibleApprovableForRule
   end
 
   def all_approvers_including_groups
-    return super if ::Feature.disabled?(:approval_rule)
+    return super if ::Feature.disabled?(:approval_rules, project)
 
     approval_state.approvers
   end
 
   def approvers_from_groups
-    return super if ::Feature.disabled?(:approval_rule)
+    return super if ::Feature.disabled?(:approval_rules, project)
 
     groups = approval_state.wrapped_approval_rules.flat_map(&:groups)
     User.joins(:group_members).where(members: { source_id: groups })

ee/app/models/ee/merge_request.rb

@@ -57,7 +57,7 @@ module EE
       strong_memoize(:participant_approvers) do
         next [] unless approval_needed?
 
-        if ::Feature.enabled?(:approval_rule)
+        if ::Feature.enabled?(:approval_rules, project)
           approval_state.filtered_approvers(code_owner: false, unactioned: true)
         else
           approvers = [

ee/spec/controllers/projects/merge_requests_controller_spec.rb

@@ -100,7 +100,7 @@ describe Projects::MergeRequestsController do
   let(:viewer)        { user }
 
   before do
-    stub_feature_flags(approval_rule: false)
+    stub_feature_flags(approval_rules: false)
     sign_in(viewer)
   end
 

ee/spec/features/merge_request/user_approves_spec.rb

@@ -61,7 +61,7 @@ describe 'Merge request > User approves', :js do
 
     context 'when CI is running but no approval given' do
       before do
-        stub_feature_flags(approval_rule: false) # TODO check in !9001 when feature enabled
+        stub_feature_flags(approval_rules: false) # TODO check in !9001 when feature enabled
         create :approver_group, group: group, target: merge_request
         pipeline = create(:ci_empty_pipeline, project: project, sha: merge_request.diff_head_sha, ref: merge_request.source_branch)
         merge_request.update(head_pipeline: pipeline)

ee/spec/features/merge_request/user_sets_approvers_spec.rb

@@ -53,7 +53,7 @@ describe 'Merge request > User sets approvers', :js do
       let(:other_user) { create(:user) }
 
       before do
-        stub_feature_flags(approval_rule: false) # TODO check in !9001 when feature enabled
+        stub_feature_flags(approval_rules: false) # TODO check in !9001 when feature enabled
         project.add_developer(user)
         project.add_developer(other_user)
 
@@ -109,7 +109,7 @@ describe 'Merge request > User sets approvers', :js do
       let(:merge_request) { create(:merge_request, source_project: project) }
 
       before do
-        stub_feature_flags(approval_rule: false) # TODO check in !9001 when feature enabled
+        stub_feature_flags(approval_rules: false) # TODO check in !9001 when feature enabled
         project.add_developer(user)
 
         sign_in(user)

ee/spec/features/projects/merge_requests/user_approves_merge_request_spec.rb

@@ -14,7 +14,7 @@ describe 'User approves a merge request', :js do
 
   context 'when user can approve' do
     before do
-      stub_feature_flags(approval_rule: false) # TODO check in !9001 when feature enabled
+      stub_feature_flags(approval_rules: false) # TODO check in !9001 when feature enabled
       visit(merge_request_path(merge_request))
     end
 
@@ -31,7 +31,7 @@ describe 'User approves a merge request', :js do
 
   context 'when a merge request is approved additionally' do
     before do
-      stub_feature_flags(approval_rule: false) # TODO check in !9001 when feature enabled
+      stub_feature_flags(approval_rules: false) # TODO check in !9001 when feature enabled
       project.add_developer(user2)
       project.add_developer(user3)
     end
@@ -75,7 +75,7 @@ describe 'User approves a merge request', :js do
 
   context 'when user cannot approve' do
     before do
-      stub_feature_flags(approval_rule: false) # TODO check in !9001 when feature enabled
+      stub_feature_flags(approval_rules: false) # TODO check in !9001 when feature enabled
       merge_request.approvers.create(user_id: user2.id)
 
       visit(merge_request_path(merge_request))

ee/spec/models/approvable_spec.rb

@@ -6,7 +6,7 @@ describe Approvable do
   let(:author) { merge_request.author }
 
   before do
-    stub_feature_flags(approval_rule: false)
+    stub_feature_flags(approval_rules: false)
   end
 
   describe '#approvers_overwritten?' do

ee/spec/models/merge_request_spec.rb

@@ -52,7 +52,7 @@ describe MergeRequest do
     let(:stranger) { create(:user) }
 
     before do
-      stub_feature_flags(approval_rule: false)
+      stub_feature_flags(approval_rules: false)
 
       project.add_developer(author)
       project.add_developer(approver)

ee/spec/models/visible_approvable_spec.rb

@@ -6,7 +6,7 @@ describe VisibleApprovable do
   let!(:user) { project.creator }
 
   before do
-    stub_feature_flags(approval_rule: false)
+    stub_feature_flags(approval_rules: false)
   end
 
   describe '#requires_approve' do

ee/spec/presenters/merge_request_presenter_spec.rb

@@ -21,7 +21,7 @@ describe MergeRequestPresenter do
     let!(:approver) { create(:approver, target: resource) }
 
     before do
-      stub_feature_flags(approval_rule: false)
+      stub_feature_flags(approval_rules: false)
       resource.approvals.create!(user: approver.user)
     end
 
@@ -71,7 +71,7 @@ describe MergeRequestPresenter do
     subject { described_class.new(resource, current_user: user).all_approvers_including_groups }
 
     before do
-      stub_feature_flags(approval_rule: false)
+      stub_feature_flags(approval_rules: false)
     end
 
     it { is_expected.to match_array(public_approver_group.users + [approver.user]) }

ee/spec/requests/api/merge_request_approvals_spec.rb

@@ -10,7 +10,7 @@ describe API::MergeRequestApprovals do
   before do
     project.update_attribute(:approvals_before_merge, 2)
 
-    stub_feature_flags(approval_rule: false)
+    stub_feature_flags(approval_rules: false)
   end
 
   describe 'GET :id/merge_requests/:merge_request_iid/approvals' do

ee/spec/requests/api/project_approvals_spec.rb

@@ -11,7 +11,7 @@ describe API::ProjectApprovals do
   let(:url) { "/projects/#{project.id}/approvals" }
 
   before do
-    stub_feature_flags(approval_rule: false)
+    stub_feature_flags(approval_rules: false)
   end
 
   describe 'GET /projects/:id/approvers' do

ee/spec/services/ee/merge_requests/refresh_service_spec.rb

@@ -79,7 +79,7 @@ describe MergeRequests::RefreshService do
         let(:relevant_merge_requests) { [merge_request, another_merge_request] }
 
         before do
-          stub_feature_flags(approval_rule: false)
+          stub_feature_flags(approval_rules: false)
 
           relevant_merge_requests.each do |merge_request|
             expect(::Gitlab::CodeOwners).to receive(:for_merge_request).with(merge_request).and_return(new_owners)

ee/spec/services/ee/notification_service_spec.rb

@@ -525,7 +525,7 @@ describe EE::NotificationService, :mailer do
     end
 
     before do
-      stub_feature_flags(approval_rule: false)
+      stub_feature_flags(approval_rules: false)
 
       project.add_maintainer(merge_request.author)
       project.add_maintainer(merge_request.assignee)

ee/spec/services/merge_requests/remove_approval_service_spec.rb

@@ -9,7 +9,7 @@ describe MergeRequests::RemoveApprovalService do
     subject(:service) { described_class.new(project, user) }
 
     before do
-      stub_feature_flags(approval_rule: false)
+      stub_feature_flags(approval_rules: false)
     end
 
     def execute!

ee/spec/services/merge_requests/update_service_spec.rb

@@ -82,7 +82,7 @@ describe MergeRequests::UpdateService, :mailer do
 
     context 'merge' do
       before do
-        stub_feature_flags(approval_rule: false)
+        stub_feature_flags(approval_rules: false)
       end
 
       let(:opts) { { merge: merge_request.diff_head_sha } }
@@ -123,7 +123,7 @@ describe MergeRequests::UpdateService, :mailer do
       let(:new_approver) { create(:user) }
 
       before do
-        stub_feature_flags(approval_rule: false)
+        stub_feature_flags(approval_rules: false)
 
         project.add_developer(existing_approver)
         project.add_developer(removed_approver)

ee/spec/services/projects/update_service_spec.rb

@@ -231,7 +231,7 @@ describe Projects::UpdateService, '#execute' do
 
   context 'with approval_rules' do
     it "updates approval_rules' approvals_required" do
-      stub_feature_flags(approval_rule: false)
+      stub_feature_flags(approval_rules: false)
 
       rule = create(:approval_project_rule, project: project)