Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce into zj-mattermost-slash-config

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/mattermost/client.rb b/lib/mattermost/client.rb
index 6eaaed34063..fa3c9fa27bd 100644
--- a/lib/mattermost/client.rb
+++ b/lib/mattermost/client.rb
@@ -34,7 +34,7 @@ module Mattermost
       end
 
       json_response
-    rescue JSON::JSONError => e
+    rescue JSON::JSONError
       raise ClientError('Cannot parse response')
     end
   end
diff --git a/lib/mattermost/session.rb b/lib/mattermost/session.rb
index 38a71061097..8f14ed306b8 100644
--- a/lib/mattermost/session.rb
+++ b/lib/mattermost/session.rb
@@ -75,9 +75,9 @@ module Mattermost
     def get(path, options = {})
       self.class.get(path, options.merge(headers: @headers))
     rescue HTTParty::Error => e
-      raise ConnectionError(e.message)
+      raise Mattermost::ConnectionError.new(e.message)
     rescue Errno::ECONNREFUSED => e
-      raise ConnectionError(e.message)
+      raise Mattermost::ConnectionError.new(e.message)
     end
 
     def post(path, options = {})