summaryrefslogtreecommitdiff
path: root/lib/mattermost
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-01 00:09:59 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-01 00:09:59 +0000
commit3795b229ab9d63846002ebb9b95073c3cbf5ab98 (patch)
treecb407d4e4d2d6a1b2f1f3f5850dccfe423eed302 /lib/mattermost
parent3aeda4e6146bea1920c3283e98b01ca4fcf796a8 (diff)
downloadgitlab-ce-3795b229ab9d63846002ebb9b95073c3cbf5ab98.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/mattermost')
-rw-r--r--lib/mattermost/client.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mattermost/client.rb b/lib/mattermost/client.rb
index 293d0c563c5..01a9567491f 100644
--- a/lib/mattermost/client.rb
+++ b/lib/mattermost/client.rb
@@ -49,7 +49,7 @@ module Mattermost
end
def json_response(response)
- json_response = JSON.parse(response.body)
+ json_response = Gitlab::Json.parse(response.body)
unless response.success?
raise Mattermost::ClientError.new(json_response['message'] || 'Undefined error')