Merge branch 'handle-disabled-request-store' into 'master'

Only use RequestStore in ProjectTeam#max_member_access_for_users if it is active

See merge request !5604

app/models/project_team.rb

@@ -138,8 +138,13 @@ class ProjectTeam
   def max_member_access_for_user_ids(user_ids)
     user_ids = user_ids.uniq
     key = "max_member_access:#{project.id}"
+
+    access = {}
+
+    if RequestStore.active?
       RequestStore.store[key] ||= {}
       access = RequestStore.store[key]
+    end
 
     # Lookup only the IDs we need
     user_ids = user_ids - access.keys

spec/models/project_team_spec.rb

@@ -199,7 +199,19 @@ describe ProjectTeam, models: true do
     end
   end
 
+  shared_examples_for "#max_member_access_for_users" do |enable_request_store|
     describe "#max_member_access_for_users" do
+      before do
+        RequestStore.begin! if enable_request_store
+      end
+
+      after do
+        if enable_request_store
+          RequestStore.end!
+          RequestStore.clear!
+        end
+      end
+
       it 'returns correct roles for different users' do
         master = create(:user)
         reporter = create(:user)
@@ -243,4 +255,13 @@ describe ProjectTeam, models: true do
         expect(project.team.max_member_access_for_user_ids(users)).to eq(expected)
       end
     end
+  end
+
+  describe '#max_member_access_for_users with RequestStore' do
+    it_behaves_like "#max_member_access_for_users", true
+  end
+
+  describe '#max_member_access_for_users without RequestStore' do
+    it_behaves_like "#max_member_access_for_users", false
+  end
 end