From 1436423a490fe9f4c1ee1ccb8ecaa6240eed2906 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Thu, 2 Aug 2018 11:17:00 -0700 Subject: Fix failing 500 errors when deploy tokens are used to clone A DeployToken responds to `:username`, but it returns the username for the token, not a User object. Don't attempt to log user activity in this case. Closes gitlab-org/gitlab-ee#7080 --- app/services/users/activity_service.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'app/services/users') diff --git a/app/services/users/activity_service.rb b/app/services/users/activity_service.rb index 822df6c646a..db03ba8756f 100644 --- a/app/services/users/activity_service.rb +++ b/app/services/users/activity_service.rb @@ -11,6 +11,7 @@ module Users author.user end + @user = nil unless @user.is_a?(User) @activity = activity end -- cgit v1.2.3