Commit d6808837 authored by Stan Hu's avatar Stan Hu

Merge branch 'fix-typo-activity-lease' into 'master'

Fix typo in activity lease

See merge request gitlab-org/gitlab-ce!27288
parents c61fd077 65b4b0cf
...@@ -30,7 +30,7 @@ module Users ...@@ -30,7 +30,7 @@ module Users
return if @user.last_activity_on == today 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) timeout: LEASE_TIMEOUT)
return unless lease.try_obtain return unless lease.try_obtain
......
...@@ -76,7 +76,7 @@ describe Users::ActivityService do ...@@ -76,7 +76,7 @@ describe Users::ActivityService do
let(:last_activity_on) { nil } let(:last_activity_on) { nil }
it 'does not update last_activity_on' do it 'does not update last_activity_on' do
stub_exclusive_lease_taken("acitvity_service:#{user.id}", timeout: 1.minute.to_i) stub_exclusive_lease_taken("activity_service:#{user.id}", timeout: 1.minute.to_i)
expect { subject.execute }.not_to change(user, :last_activity_on) expect { subject.execute }.not_to change(user, :last_activity_on)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment