Merge branch '27954-remove-hipchat-project-service' into 'master'

Remove HipChat integration from frontend and docs

See merge request gitlab-org/gitlab!57556

app/models/project.rb

@@ -1370,9 +1370,9 @@ class Project < ApplicationRecord
   end
 
   def disabled_services
-    return %w(datadog) unless Feature.enabled?(:datadog_ci_integration, self)
+    return %w[datadog hipchat] unless Feature.enabled?(:datadog_ci_integration, self)
 
-    []
+    %w[hipchat]
   end
 
   def find_or_initialize_service(name)

app/models/service.rb

@@ -12,7 +12,7 @@ class Service < ApplicationRecord
 
   SERVICE_NAMES = %w[
     asana assembla bamboo bugzilla buildkite campfire confluence custom_issue_tracker datadog discord
-    drone_ci emails_on_push ewm external_wiki flowdock hangouts_chat hipchat irker jira
+    drone_ci emails_on_push ewm external_wiki flowdock hangouts_chat irker jira
     mattermost mattermost_slash_commands microsoft_teams packagist pipelines_email
     pivotaltracker prometheus pushover redmine slack slack_slash_commands teamcity unify_circuit webex_teams youtrack
   ].freeze

changelogs/unreleased/27954-remove-hipchat-project-service.yml

+---
+title: Remove HipChat integration from frontend and docs
+merge_request: 57556
+author:
+type: removed

doc/.vale/gitlab/spelling-exceptions.txt

@@ -245,7 +245,6 @@ Helm
 Heroku
 Herokuish
 Hexo
-HipChat
 hostname
 hostnames
 hotfix

doc/api/graphql/reference/index.md

@@ -8013,7 +8013,6 @@ State of a Sentry error.
 | `FLOWDOCK_SERVICE` | FlowdockService type. |
 | `GITHUB_SERVICE` | GithubService type. |
 | `HANGOUTS_CHAT_SERVICE` | HangoutsChatService type. |
-| `HIPCHAT_SERVICE` | HipchatService type. |
 | `IRKER_SERVICE` | IrkerService type. |
 | `JENKINS_SERVICE` | JenkinsService type. |
 | `JIRA_SERVICE` | JiraService type. |

doc/api/services.md

@@ -692,53 +692,6 @@ Get Hangouts Chat service settings for a project.
 GET /projects/:id/services/hangouts-chat
 ```
 
-## HipChat
-
-Private group chat and IM
-
-### Create/Edit HipChat service
-
-Set HipChat service for a project.
-
-```plaintext
-PUT /projects/:id/services/hipchat
-```
-
-Parameters:
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `token` | string | true | Room token |
-| `color` | string | false | The room color |
-| `notify` | boolean | false | Enable notifications |
-| `room` | string | false |Room name or ID |
-| `api_version` | string | false | Leave blank for default (v2) |
-| `server` | string | false | Leave blank for default. For example, `https://hipchat.example.com`. |
-| `push_events` | boolean | false | Enable notifications for push events |
-| `issues_events` | boolean | false | Enable notifications for issue events |
-| `confidential_issues_events` | boolean | false | Enable notifications for confidential issue events |
-| `merge_requests_events` | boolean | false | Enable notifications for merge request events |
-| `tag_push_events` | boolean | false | Enable notifications for tag push events |
-| `note_events` | boolean | false | Enable notifications for note events |
-| `confidential_note_events` | boolean | false | Enable notifications for confidential note events |
-| `pipeline_events` | boolean | false | Enable notifications for pipeline events |
-
-### Delete HipChat service
-
-Delete HipChat service for a project.
-
-```plaintext
-DELETE /projects/:id/services/hipchat
-```
-
-### Get HipChat service settings
-
-Get HipChat service settings for a project.
-
-```plaintext
-GET /projects/:id/services/hipchat
-```
-
 ## Irker (IRC gateway)
 
 Send IRC messages, on update, to a list of recipients through an Irker gateway.

doc/integration/README.md

@@ -63,7 +63,7 @@ or [Kroki](../administration/integration/kroki.md) to use diagrams in AsciiDoc a
 
 ## Integrations
 
-Integration with services such as Campfire, Flowdock, HipChat, Pivotal Tracker, and Slack are available as [Integrations](../user/project/integrations/overview.md).
+Integration with services such as Campfire, Flowdock, Jira, Pivotal Tracker, and Slack are available as [Integrations](../user/project/integrations/overview.md).
 
 ## Troubleshooting
 

doc/user/index.md

@@ -70,7 +70,7 @@ With GitLab Enterprise Edition, you can also:
 - Leverage continuous delivery method with [Canary Deployments](project/canary_deployments.md).
 - Scan your code for vulnerabilities and [display them in merge requests](application_security/sast/index.md).
 
-You can also [integrate](project/integrations/overview.md) GitLab with numerous third-party applications, such as Mattermost, Microsoft Teams, HipChat, Trello, Slack, Bamboo CI, Jira, and a lot more.
+You can also [integrate](project/integrations/overview.md) GitLab with numerous third-party applications, such as Mattermost, Microsoft Teams, Trello, Slack, Bamboo CI, Jira, and a lot more.
 
 ## User types
 

doc/user/project/integrations/hipchat.md

----
-stage: Create
-group: Ecosystem
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
----
-
-# Atlassian HipChat **(FREE)**
-
-WARNING:
-This feature, and the integration for it, were
-[deprecated](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57434) in
-GitLab 13.11. The HipChat integration no longer sends any notifications to HipChat.
-
-GitLab provides a way to send HipChat notifications upon a number of events,
-such as when a user pushes code, creates a branch or tag, adds a comment, and
-creates a merge request.
-
-## Setup
-
-GitLab requires the use of a HipChat v2 API token to work. v1 tokens are
-not supported at this time. Note the differences between v1 and v2 tokens:
-
-HipChat v1 API (legacy) supports "API Auth Tokens" in the Group API menu. A v1
-token is allowed to send messages to *any* room.
-
-HipChat v2 API has tokens that are can be created using the Integrations tab
-in the Group or Room administration page. By design, these are lightweight tokens that
-allow GitLab to send messages only to *one* room.
-
-### Complete these steps in HipChat
-
-1. Go to: `https://admin.hipchat.com/admin`
-1. Click on "Group Admin" -> "Integrations".
-1. Find "Build Your Own!" and click "Create".
-1. Select the desired room, name the integration "GitLab", and click "Create".
-1. In the "Send messages to this room by posting this URL" column, you should
-   see a URL in the format:
-
-```plaintext
-https://api.hipchat.com/v2/room/<room>/notification?auth_token=<token>
-```
-
-HipChat is now ready to accept messages from GitLab. Next, set up the HipChat
-service in GitLab.
-
-### Complete these steps in GitLab
-
-1. Navigate to the project you want to configure for notifications.
-1. Navigate to the [Integrations page](overview.md#accessing-integrations)
-1. Click "HipChat".
-1. Ensure that the **Active** toggle is enabled.
-1. Insert the `token` field from the URL into the `Token` field on the Web page.
-1. Insert the `room` field from the URL into the `Room` field on the Web page.
-1. Save or optionally click "Test Settings".
-
-## Troubleshooting
-
-If you do not see notifications, make sure you are using a HipChat v2 API
-token, not a v1 token.
-
-Note that the v2 token is tied to a specific room. If you want to be able to
-specify arbitrary rooms, you can create an API token for a specific user in
-HipChat under "Account settings" and "API access". Use the `XXX` value under
-`auth_token=XXX`.

doc/user/project/integrations/overview.md

@@ -41,7 +41,6 @@ Click on the service links to see further configuration instructions and details
 | [Generic alerts](../../../operations/incident_management/integrations.md) **(ULTIMATE)** | Receive alerts on GitLab from any source | No |
 | [GitHub](github.md) **(PREMIUM)** | Sends pipeline notifications to GitHub | No |
 | [Hangouts Chat](hangouts_chat.md) | Receive events notifications in Google Hangouts Chat | No |
-| [HipChat](hipchat.md) | Private group chat and IM | No |
 | [Irker (IRC gateway)](irker.md) | Send IRC messages, on update, to a list of recipients through an Irker gateway | No |
 | [Jira](jira.md) | Jira issue tracker | No |
 | [Jenkins](../../../integration/jenkins.md) **(STARTER)** | An extendable open source continuous integration server | Yes |

spec/features/projects/services/disable_triggers_spec.rb

@@ -12,10 +12,10 @@ RSpec.describe 'Disable individual triggers', :js do
   end
 
   context 'service has multiple supported events' do
-    let(:service_name) { 'HipChat' }
+    let(:service_name) { 'Jenkins CI' }
 
     it 'shows trigger checkboxes' do
-      event_count = HipchatService.supported_events.count
+      event_count = JenkinsService.supported_events.count
 
       expect(page).to have_content "Trigger"
       expect(page).to have_css(checkbox_selector, visible: :all, count: event_count)

spec/features/projects/services/user_activates_hipchat_spec.rb

-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe 'User activates HipChat', :js do
-  include_context 'project service activation'
-
-  context 'with standard settings' do
-    before do
-      stub_request(:post, /.*api.hipchat.com.*/)
-    end
-
-    it 'activates service' do
-      visit_project_integration('HipChat')
-      fill_in('Room', with: 'gitlab')
-      fill_in('Token', with: 'verySecret')
-
-      click_test_then_save_integration(expect_test_to_fail: false)
-
-      expect(page).to have_content('HipChat settings saved and active.')
-    end
-  end
-
-  context 'with custom settings' do
-    before do
-      stub_request(:post, /.*chat.example.com.*/)
-    end
-
-    it 'activates service' do
-      visit_project_integration('HipChat')
-      fill_in('Room', with: 'gitlab_custom')
-      fill_in('Token', with: 'secretCustom')
-      fill_in('Server', with: 'https://chat.example.com')
-
-      click_test_then_save_integration(expect_test_to_fail: false)
-
-      expect(page).to have_content('HipChat settings saved and active.')
-    end
-  end
-end

spec/features/projects/services/user_views_services_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe 'User views services' do
 
     expect(page).to have_content('Integrations')
     expect(page).to have_content('Campfire')
-    expect(page).to have_content('HipChat')
+    expect(page).to have_content('Jira')
     expect(page).to have_content('Assembla')
     expect(page).to have_content('Pushover')
     expect(page).to have_content('Atlassian Bamboo')