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 /Gemfile.lock | |
| 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 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index b522aa85b39..3314a769949 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -366,6 +366,9 @@ GEM hashie (>= 3.0) health_check (2.6.0) rails (>= 4.0) + hipchat (1.5.2) + httparty + mimemagic html-pipeline (2.8.4) activesupport (>= 2) nokogiri (>= 1.4) @@ -1040,6 +1043,7 @@ DEPENDENCIES hangouts-chat (~> 0.0.5) hashie-forbidden_attributes health_check (~> 2.6.0) + hipchat (~> 1.5.0) html-pipeline (~> 2.8) html2text httparty (~> 0.16.4) |