Commit 1436423a authored by Stan Hu's avatar Stan Hu

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
parent 93c7b6c5
...@@ -11,6 +11,7 @@ module Users ...@@ -11,6 +11,7 @@ module Users
author.user author.user
end end
@user = nil unless @user.is_a?(User)
@activity = activity @activity = activity
end end
......
...@@ -28,6 +28,18 @@ describe Users::ActivityService do ...@@ -28,6 +28,18 @@ describe Users::ActivityService do
end end
end end
context 'when a bad object is passed' do
let(:fake_object) { double(username: 'hello') }
it 'does not record activity' do
service = described_class.new(fake_object, 'pull')
expect(service).not_to receive(:record_activity)
service.execute
end
end
context 'when last activity is today' do context 'when last activity is today' do
let(:last_activity_on) { Date.today } let(:last_activity_on) { Date.today }
......
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