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:
Diffstat (limited to 'lib/gitlab/chat_name_token.rb')
-rw-r--r--lib/gitlab/chat_name_token.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/chat_name_token.rb b/lib/gitlab/chat_name_token.rb
index 9b4cb9d0134..76f2a4ae38c 100644
--- a/lib/gitlab/chat_name_token.rb
+++ b/lib/gitlab/chat_name_token.rb
@@ -16,7 +16,9 @@ module Gitlab
def get
Gitlab::Redis::SharedState.with do |redis|
data = redis.get(redis_shared_state_key)
- Gitlab::Json.parse(data, symbolize_names: true) if data
+ params = Gitlab::Json.parse(data, symbolize_names: true) if data
+ params[:integration_id] ||= params.delete(:service_id) if params && params[:service_id]
+ params
end
end