diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-04-11 12:32:56 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-04-11 12:32:56 +0000 |
| commit | 0276b8682e37d361adbd1ac89d9ba6992f0d1b60 (patch) | |
| tree | 921c7b84db8492726b2b06baed09b5385f1f4440 /spec/lib | |
| parent | ec7804444343cef3562d88aab2d255287a215430 (diff) | |
| parent | a409a77d5c5d75b02421e7d4a8a293c3469e7556 (diff) | |
| download | gitlab-ce-0276b8682e37d361adbd1ac89d9ba6992f0d1b60.tar.gz | |
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 'spec/lib')
| -rw-r--r-- | spec/lib/gitlab/import_export/all_models.yml | 1 | ||||
| -rw-r--r-- | spec/lib/gitlab/import_export/project.json | 22 |
2 files changed, 23 insertions, 0 deletions
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml index ed557ffd4e3..54369ff75f4 100644 --- a/spec/lib/gitlab/import_export/all_models.yml +++ b/spec/lib/gitlab/import_export/all_models.yml @@ -223,6 +223,7 @@ project: - packagist_service - pivotaltracker_service - prometheus_service +- hipchat_service - flowdock_service - assembla_service - asana_service diff --git a/spec/lib/gitlab/import_export/project.json b/spec/lib/gitlab/import_export/project.json index 773651dd226..4a7accc4c52 100644 --- a/spec/lib/gitlab/import_export/project.json +++ b/spec/lib/gitlab/import_export/project.json @@ -6795,6 +6795,28 @@ "wiki_page_events": true }, { + "id": 93, + "title": "HipChat", + "project_id": 5, + "created_at": "2016-06-14T15:01:51.219Z", + "updated_at": "2016-06-14T15:01:51.219Z", + "active": false, + "properties": { + "notify_only_broken_pipelines": true + }, + "template": false, + "push_events": true, + "issues_events": true, + "merge_requests_events": true, + "tag_push_events": true, + "note_events": true, + "pipeline_events": true, + "type": "HipchatService", + "category": "common", + "default": false, + "wiki_page_events": true + }, + { "id": 91, "title": "Flowdock", "project_id": 5, |