Merge branch 'deprecated-force-reload' into 'master'

Fix deprecation: Passing an argument to force an association to reload is now deprecated

See merge request gitlab-org/gitlab-ce!24136

app/models/concerns/manual_inverse_association.rb

@@ -5,8 +5,8 @@ module ManualInverseAssociation
 
   class_methods do
     def manual_inverse_association(association, inverse)
-      define_method(association) do |*args|
-        super(*args).tap do |value|
+      define_method(association) do
+        super().tap do |value|
           next unless value
 
           child_association = value.association(inverse)

changelogs/unreleased/deprecated-force-reload.yml

+---
+title: 'Fix deprecation: Passing an argument to force an association to reload is
+  now deprecated'
+merge_request: 24136
+author: Jasper Maes
+type: other

spec/models/concerns/manual_inverse_association_spec.rb

@@ -32,10 +32,10 @@ describe ManualInverseAssociation do
           .not_to exceed_query_limit(0)
       end
 
-      it 'passes arguments to the default association method, to allow reloading' do
+      it 'allows reloading the relation' do
         query_count = ActiveRecord::QueryRecorder.new do
           instance.manual_association
-          instance.manual_association(true)
+          instance.reload_manual_association
         end.count
 
         expect(query_count).to eq(2)

spec/models/gpg_key_spec.rb

@@ -199,7 +199,7 @@ describe GpgKey do
 
       gpg_key.revoke
 
-      expect(gpg_key.subkeys(true)).to be_blank
+      expect(gpg_key.subkeys.reload).to be_blank
     end
 
     it 'invalidates all signatures associated to the subkeys' do

spec/services/ci/process_pipeline_service_spec.rb

@@ -762,7 +762,7 @@ describe Ci::ProcessPipelineService, '#execute' do
   end
 
   def manual_actions
-    pipeline.manual_actions(true)
+    pipeline.manual_actions.reload
   end
 
   def create_build(name, **opts)