diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-08-02 21:00:13 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-08-02 21:00:13 +0000 |
| commit | 7da6ac06449eaf6a5385c3f5c24c5217731aa213 (patch) | |
| tree | 200c90b3f8715270e0699afe8b092f2688ee9c9a /app/services/users | |
| parent | c60cb3935089eeb358b8e96e63d879d5b49a3dcf (diff) | |
| parent | 1436423a490fe9f4c1ee1ccb8ecaa6240eed2906 (diff) | |
| download | gitlab-ce-7da6ac06449eaf6a5385c3f5c24c5217731aa213.tar.gz | |
Merge branch 'sh-fix-failing-deploy-token-clones' into 'master'
Fix failing 500 errors when deploy tokens are used to clone
Closes gitlab-ee#7080
See merge request gitlab-org/gitlab-ce!20993
Diffstat (limited to 'app/services/users')
| -rw-r--r-- | app/services/users/activity_service.rb | 1 |
1 files changed, 1 insertions, 0 deletions
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 |