diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-04-12 13:50:15 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-04-12 13:50:15 +0000 |
| commit | d6808837d2d4814a1c97169b7c0035b9e71b53d9 (patch) | |
| tree | e41d4b1a587efa2a326cc6fcf82e7262f064a9e0 /app | |
| parent | c61fd077a42b1498dc82cc5fb17a0efcc9d758d5 (diff) | |
| parent | 65b4b0cf468744b4e7ed7a874b1eb920317c0d43 (diff) | |
| download | gitlab-ce-d6808837d2d4814a1c97169b7c0035b9e71b53d9.tar.gz | |
Merge branch 'fix-typo-activity-lease' into 'master'
Fix typo in activity lease
See merge request gitlab-org/gitlab-ce!27288
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/users/activity_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/users/activity_service.rb b/app/services/users/activity_service.rb index e50840a9158..33444c2a7dc 100644 --- a/app/services/users/activity_service.rb +++ b/app/services/users/activity_service.rb @@ -30,7 +30,7 @@ module Users return if @user.last_activity_on == today - lease = Gitlab::ExclusiveLease.new("acitvity_service:#{@user.id}", + lease = Gitlab::ExclusiveLease.new("activity_service:#{@user.id}", timeout: LEASE_TIMEOUT) return unless lease.try_obtain |