Merge branch 'restore-hipchat' into 'master'
Revert "Remove HipChat integration from GitLab" Closes #60042 See merge request gitlab-org/gitlab-ce!27172 (cherry picked from commit 0276b868) cd9ae6bb Revert "Remove HipChat integration from GitLab" 38d8616e Add changelog entry 69544c1e Fix UrlBlocker spec e00c7016 Add frozen_string_literal to HipChat files a409a77d Restore index on services.type