Merge branch...

Merge branch '324735-newissueworker-is-failing-when-we-log-about-skipping-notifications' into 'master'

Cast object class to string to avoid infinite loop

See merge request gitlab-org/gitlab!56727

app/services/notification_service.rb

@@ -857,7 +857,7 @@ class NotificationService
   end
 
   def warn_skipping_notifications(user, object)
-    Gitlab::AppLogger.warn(message: "Skipping sending notifications", user: user.id, klass: object.class, object_id: object.id)
+    Gitlab::AppLogger.warn(message: "Skipping sending notifications", user: user.id, klass: object.class.to_s, object_id: object.id)
   end
 end
 

ee/spec/services/ee/notification_service_spec.rb

@@ -655,7 +655,7 @@ RSpec.describe EE::NotificationService, :mailer do
 
       shared_examples 'is not able to send notifications' do
         it 'does not send any notification' do
-          expect(Gitlab::AppLogger).to receive(:warn).with(message: 'Skipping sending notifications', user: current_user.id, klass: epic.class, object_id: epic.id)
+          expect(Gitlab::AppLogger).to receive(:warn).with(message: 'Skipping sending notifications', user: current_user.id, klass: epic.class.to_s, object_id: epic.id)
 
           execute
 

ee/spec/workers/new_epic_worker_spec.rb

@@ -45,7 +45,7 @@ RSpec.describe NewEpicWorker do
         it 'does not create a notification for the mentioned user' do
           expect(Notify).not_to receive(:new_epic_email).with(user.id, epic.id, nil)
 
-          expect(Gitlab::AppLogger).to receive(:warn).with(message: 'Skipping sending notifications', user: user.id, klass: epic.class, object_id: epic.id)
+          expect(Gitlab::AppLogger).to receive(:warn).with(message: 'Skipping sending notifications', user: user.id, klass: epic.class.to_s, object_id: epic.id)
 
           worker.perform(epic.id, user.id)
         end

spec/services/notification_service_spec.rb

@@ -105,7 +105,7 @@ RSpec.describe NotificationService, :mailer do
       recipient_1 = NotificationRecipient.new(user_1, :custom, custom_action: :new_release)
       allow(NotificationRecipients::BuildService).to receive(:build_new_release_recipients).and_return([recipient_1])
 
-      expect(Gitlab::AppLogger).to receive(:warn).with(message: 'Skipping sending notifications', user: current_user.id, klass: object.class, object_id: object.id)
+      expect(Gitlab::AppLogger).to receive(:warn).with(message: 'Skipping sending notifications', user: current_user.id, klass: object.class.to_s, object_id: object.id)
 
       action
 

spec/workers/new_issue_worker_spec.rb

@@ -49,7 +49,7 @@ RSpec.describe NewIssueWorker do
           expect(Notify).not_to receive(:new_issue_email)
             .with(mentioned.id, issue.id, NotificationReason::MENTIONED)
 
-          expect(Gitlab::AppLogger).to receive(:warn).with(message: 'Skipping sending notifications', user: user.id, klass: issue.class, object_id: issue.id)
+          expect(Gitlab::AppLogger).to receive(:warn).with(message: 'Skipping sending notifications', user: user.id, klass: issue.class.to_s, object_id: issue.id)
 
           worker.perform(issue.id, user.id)
         end

spec/workers/new_merge_request_worker_spec.rb

@@ -53,7 +53,7 @@ RSpec.describe NewMergeRequestWorker do
           expect(Notify).not_to receive(:new_merge_request_email)
             .with(mentioned.id, merge_request.id, NotificationReason::MENTIONED)
 
-          expect(Gitlab::AppLogger).to receive(:warn).with(message: 'Skipping sending notifications', user: user.id, klass: merge_request.class, object_id: merge_request.id)
+          expect(Gitlab::AppLogger).to receive(:warn).with(message: 'Skipping sending notifications', user: user.id, klass: merge_request.class.to_s, object_id: merge_request.id)
 
           worker.perform(merge_request.id, user.id)
         end