Automatic merge of gitlab-org/gitlab-ce master

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
 

spec/services/users/activity_service_spec.rb

@@ -76,7 +76,7 @@ describe Users::ActivityService do
       let(:last_activity_on) { nil }
 
       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)
       end