diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
tree | 5423a1c7516cffe36384133ade12572cf709398d /app/services/chat_names/find_user_service.rb | |
parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'app/services/chat_names/find_user_service.rb')
-rw-r--r-- | app/services/chat_names/find_user_service.rb | 6 |
1 files changed, 3 insertions, 3 deletions
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] ) |