Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-08-03 18:11:10 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-08-03 18:11:10 +0300
commit849c67f6da8d997d9fa54bba3526c64c7678aae6 (patch)
tree8236ab0e5f4151afe7052b4a0559f5d27c89928d /spec/channels/awareness_channel_spec.rb
parent91035102b4e313787a45217ff12bb88f7f48bf20 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/channels/awareness_channel_spec.rb')
-rw-r--r--spec/channels/awareness_channel_spec.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/channels/awareness_channel_spec.rb b/spec/channels/awareness_channel_spec.rb
index 8d6dc36f6bd..2bc62a2d44a 100644
--- a/spec/channels/awareness_channel_spec.rb
+++ b/spec/channels/awareness_channel_spec.rb
@@ -36,6 +36,7 @@ RSpec.describe AwarenessChannel, :clean_gitlab_redis_shared_state, type: :channe
collaborator = {
id: user.id,
name: user.name,
+ username: user.username,
avatar_url: user.avatar_url(size: 36),
last_activity: Time.zone.now,
last_activity_humanized: ActionController::Base.helpers.distance_of_time_in_words(