Commit e4a62d57 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'update-health-check' into 'master'

Update health_check rubygem to latest upstream release

See merge request gitlab-org/gitlab!37272
parents 16369772 d82eb793
...@@ -440,7 +440,7 @@ gem 'activerecord-explain-analyze', '~> 0.1', require: false ...@@ -440,7 +440,7 @@ gem 'activerecord-explain-analyze', '~> 0.1', require: false
gem 'oauth2', '~> 1.4' gem 'oauth2', '~> 1.4'
# Health check # Health check
gem 'health_check', '~> 2.6.0' gem 'health_check', '~> 3.0'
# System information # System information
gem 'vmstat', '~> 2.3.0' gem 'vmstat', '~> 2.3.0'
......
...@@ -518,8 +518,8 @@ GEM ...@@ -518,8 +518,8 @@ GEM
hashie (3.6.0) hashie (3.6.0)
hashie-forbidden_attributes (0.1.1) hashie-forbidden_attributes (0.1.1)
hashie (>= 3.0) hashie (>= 3.0)
health_check (2.6.0) health_check (3.0.0)
rails (>= 4.0) railties (>= 5.0)
heapy (0.1.4) heapy (0.1.4)
hipchat (1.5.2) hipchat (1.5.2)
httparty httparty
...@@ -1283,7 +1283,7 @@ DEPENDENCIES ...@@ -1283,7 +1283,7 @@ DEPENDENCIES
hamlit (~> 2.11.0) hamlit (~> 2.11.0)
hangouts-chat (~> 0.0.5) hangouts-chat (~> 0.0.5)
hashie-forbidden_attributes hashie-forbidden_attributes
health_check (~> 2.6.0) health_check (~> 3.0)
hipchat (~> 1.5.0) hipchat (~> 1.5.0)
html-pipeline (~> 2.12) html-pipeline (~> 2.12)
html2text html2text
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment