Merge branch 'rs-update-health_check' into 'master'

Update health_check gem to `~> 2.2.0` Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22278 See merge request !6835

Merge branch 'rs-update-health_check' into 'master'
5aa7b13c · Rémy Coutable · 1cc9f286 · da64f9e5 · 5aa7b13c · 5aa7b13c
Commit 5aa7b13c authored Oct 12, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +2 -2

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -343,7 +343,7 @@ gem 'oauth2', '~> 1.2.0'
 gem 'paranoia', '~> 2.0'

 # Health check
-gem 'health_check', '~> 2.1.0'
+gem 'health_check', '~> 2.2.0'

 # System information
 gem 'vmstat', '~> 2.2'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -336,7 +336,7 @@ GEM
      thor
      tilt
    hashie (3.4.4)
-    health_check (2.1.0)
+    health_check (2.2.1)
      rails (>= 4.0)
    hipchat (1.5.2)
      httparty
@@ -875,7 +875,7 @@ DEPENDENCIES
  grape-entity (~> 0.4.2)
  haml_lint (~> 0.18.2)
  hamlit (~> 2.6.1)
-  health_check (~> 2.1.0)
+  health_check (~> 2.2.0)
  hipchat (~> 1.5.0)
  html-pipeline (~> 1.11.0)
  httparty (~> 0.13.3)