From 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 19 May 2021 15:44:42 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-12-stable-ee --- app/services/chat_names/find_user_service.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/services/chat_names/find_user_service.rb') diff --git a/app/services/chat_names/find_user_service.rb b/app/services/chat_names/find_user_service.rb index c91738fa4c7..3dd3ba7f01c 100644 --- a/app/services/chat_names/find_user_service.rb +++ b/app/services/chat_names/find_user_service.rb @@ -2,8 +2,8 @@ module ChatNames class FindUserService - def initialize(service, params) - @service = service + def initialize(integration, params) + @integration = integration @params = params end @@ -20,7 +20,7 @@ module ChatNames # rubocop: disable CodeReuse/ActiveRecord def find_chat_name ChatName.find_by( - service: @service, + integration: @integration, team_id: @params[:team_id], chat_id: @params[:user_id] ) -- cgit v1.2.3