diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-01 00:09:59 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-01 00:09:59 +0000 |
| commit | 3795b229ab9d63846002ebb9b95073c3cbf5ab98 (patch) | |
| tree | cb407d4e4d2d6a1b2f1f3f5850dccfe423eed302 /lib/gitlab/chat_name_token.rb | |
| parent | 3aeda4e6146bea1920c3283e98b01ca4fcf796a8 (diff) | |
| download | gitlab-ce-3795b229ab9d63846002ebb9b95073c3cbf5ab98.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/chat_name_token.rb b/lib/gitlab/chat_name_token.rb index 8b3c5dc9e8b..9b4cb9d0134 100644 --- a/lib/gitlab/chat_name_token.rb +++ b/lib/gitlab/chat_name_token.rb @@ -16,7 +16,7 @@ module Gitlab def get Gitlab::Redis::SharedState.with do |redis| data = redis.get(redis_shared_state_key) - JSON.parse(data, symbolize_names: true) if data + Gitlab::Json.parse(data, symbolize_names: true) if data end end |