summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-26 17:34:57 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-26 17:34:57 +0000
commitb2ce3643e27db4cc0ad30cc09d651c00ec799887 (patch)
treef0e7882be8145da2f59fec4ac26e070afd147ab9 /config
parente9143b15cc400b69ef274789225ac2fee5fdcf83 (diff)
downloadgitlab-ce-b2ce3643e27db4cc0ad30cc09d651c00ec799887.tar.gz
Add latest changes from gitlab-org/gitlab@13-10-stable-ee
Diffstat (limited to 'config')
-rw-r--r--config/initializers/hipchat_client_patch.rb15
1 files changed, 0 insertions, 15 deletions
diff --git a/config/initializers/hipchat_client_patch.rb b/config/initializers/hipchat_client_patch.rb
deleted file mode 100644
index 51bd48af320..00000000000
--- a/config/initializers/hipchat_client_patch.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-# This monkey patches the HTTParty used in https://github.com/hipchat/hipchat-rb.
-module HipChat
- class Client
- connection_adapter ::Gitlab::HTTPConnectionAdapter
- end
-
- class Room
- connection_adapter ::Gitlab::HTTPConnectionAdapter
- end
-
- class User
- connection_adapter ::Gitlab::HTTPConnectionAdapter
- end
-end