diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-04-09 14:06:36 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-04-10 12:58:18 +0100 |
| commit | cd9ae6bb820ae8ec98cce38d958298e081860dab (patch) | |
| tree | 5ae1b923e40d42392c6443e2308722bf670727f1 /Gemfile.lock | |
| parent | 0de88f57997ef1d60467464f15411dae0c7ee870 (diff) | |
| download | gitlab-ce-cd9ae6bb820ae8ec98cce38d958298e081860dab.tar.gz | |
Revert "Remove HipChat integration from GitLab"
This reverts commit a5378665a1dc0b9c8dc3a4fa279a0eb78aac5aac.
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) |