diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-13 03:09:28 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-13 03:09:28 +0000 |
| commit | 0faed4500e806f0f27cb33349bf5ecaee4cca98d (patch) | |
| tree | 77aa09778f3227f48ed1ecd4f7c0ceb0e195898d /lib/gitlab/chat_name_token.rb | |
| parent | 50a75eed991f16055c82df0a00e6d7ffdbd64796 (diff) | |
| download | gitlab-ce-0faed4500e806f0f27cb33349bf5ecaee4cca98d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/chat_name_token.rb')
| -rw-r--r-- | lib/gitlab/chat_name_token.rb | 4 |
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 |