diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-04-21 11:45:48 +0200 |
|---|---|---|
| committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-04-21 11:45:48 +0200 |
| commit | d128bc9241a1024a9e1d632555ec1e5306c89623 (patch) | |
| tree | 2dbdc44bd9ce98d1bb065ed5c4bf3db1ab9d15dc | |
| parent | 3f73d611cb7f80aafffd5b4526eb0faeebf624f6 (diff) | |
| parent | 44535f9375ef6335551b0c9640ddad5b9d6de1c9 (diff) | |
| download | gitlab-ce-d128bc9241a1024a9e1d632555ec1e5306c89623.tar.gz | |
Merge pull request #9058 from chulkilee/upgrade-hipchat
upgrade hipchat
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 6 insertions, 4 deletions
@@ -143,7 +143,7 @@ gem "redis-rails" gem 'tinder', '~> 1.9.2' # HipChat integration -gem "hipchat", "~> 1.4.0" +gem 'hipchat', '~> 1.5.0' # Flowdock integration gem "gitlab-flowdock-git-hook", "~> 0.4.2" diff --git a/Gemfile.lock b/Gemfile.lock index 360b1abcf56..9a77579d550 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -271,8 +271,9 @@ GEM hashie (2.1.2) highline (1.6.21) hike (1.2.3) - hipchat (1.4.0) + hipchat (1.5.0) httparty + mimemagic hitimes (1.2.2) html-pipeline (1.11.0) activesupport (>= 2) @@ -284,7 +285,7 @@ GEM mime-types sanitize (~> 2.1) http_parser.rb (0.5.3) - httparty (0.13.0) + httparty (0.13.3) json (~> 1.8) multi_xml (>= 0.5.2) httpauth (0.2.1) @@ -329,6 +330,7 @@ GEM mime-types (>= 1.16, < 3) method_source (0.8.2) mime-types (1.25.1) + mimemagic (0.3.0) mini_portile (0.6.1) minitest (5.3.5) mousetrap-rails (1.4.6) @@ -714,7 +716,7 @@ DEPENDENCIES guard-rspec guard-spinach haml-rails - hipchat (~> 1.4.0) + hipchat (~> 1.5.0) html-pipeline-gitlab (~> 0.1) httparty jasmine (= 2.0.2) |