diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-04-11 15:32:56 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-04-11 15:32:56 +0300 |
| commit | 0276b8682e37d361adbd1ac89d9ba6992f0d1b60 (patch) | |
| tree | 921c7b84db8492726b2b06baed09b5385f1f4440 /config | |
| parent | ec7804444343cef3562d88aab2d255287a215430 (diff) | |
| parent | a409a77d5c5d75b02421e7d4a8a293c3469e7556 (diff) | |
Merge branch 'restore-hipchat' into 'master'
Revert "Remove HipChat integration from GitLab"
Closes #60042
See merge request gitlab-org/gitlab-ce!27172
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/hipchat_client_patch.rb | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/config/initializers/hipchat_client_patch.rb b/config/initializers/hipchat_client_patch.rb new file mode 100644 index 00000000000..1879ecb15fb --- /dev/null +++ b/config/initializers/hipchat_client_patch.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true +# This monkey patches the HTTParty used in https://github.com/hipchat/hipchat-rb. +module HipChat + class Client + connection_adapter ::Gitlab::ProxyHTTPConnectionAdapter + end + + class Room + connection_adapter ::Gitlab::ProxyHTTPConnectionAdapter + end + + class User + connection_adapter ::Gitlab::ProxyHTTPConnectionAdapter + end +end |