diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-23 09:20:16 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-23 09:20:16 +0000 |
| commit | 82a8903979dbdff7558989111af7f8d3cc7f28ec (patch) | |
| tree | 1e01e771b08bc37b7c3915303c3b265daf32252f /Gemfile.lock | |
| parent | 906eb7dc1c2a2ab1332c784e133153485b950807 (diff) | |
| parent | 1ce57a7fba560daa66eee006b64bb9e77f7c51ac (diff) | |
| download | gitlab-ce-82a8903979dbdff7558989111af7f8d3cc7f28ec.tar.gz | |
Merge branch 'hangouts_chat_integration' into 'master'
Hangouts chat integration
See merge request gitlab-org/gitlab-ce!20290
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1d9c75f154c..0976169bb11 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -387,6 +387,7 @@ GEM temple (>= 0.8.0) thor tilt + hangouts-chat (0.0.5) hashdiff (0.3.4) hashie (3.5.7) hashie-forbidden_attributes (0.1.1) @@ -1062,6 +1063,7 @@ DEPENDENCIES grpc (~> 1.11.0) haml_lint (~> 0.26.0) hamlit (~> 2.8.8) + hangouts-chat (~> 0.0.5) hashie-forbidden_attributes health_check (~> 2.6.0) hipchat (~> 1.5.0) |