Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42

1 files changed, 8 insertions, 2 deletions

diff --git a/app/services/users/dismiss_user_callout_service.rb b/app/services/users/dismiss_user_callout_service.rb
index f05c44186bb..96f3f3acb57 100644
--- a/app/services/users/dismiss_user_callout_service.rb
+++ b/app/services/users/dismiss_user_callout_service.rb
@@ -3,9 +3,15 @@
 module Users
   class DismissUserCalloutService < BaseContainerService
     def execute
-      current_user.find_or_initialize_callout(params[:feature_name]).tap do |callout|
-        callout.update(dismissed_at: Time.current) if callout.valid?
+      callout.tap do |record|
+        record.update(dismissed_at: Time.current) if record.valid?
       end
     end
+
+    private
+
+    def callout
+      current_user.find_or_initialize_callout(params[:feature_name])
+    end
   end
 end