diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-10-12 17:49:29 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-12 17:49:29 +0000 |
| commit | 5aa7b13c2ed61f22aa3be48b2ad5fe2ed6ea3a5e (patch) | |
| tree | af41917dd6117f101e25ce564fbc7c7203c214bd | |
| parent | 1cc9f286bdb27974c84d4ce2b84f6f10c393c568 (diff) | |
| parent | da64f9e544bc5f05818c3f66b278e6e30584a8b4 (diff) | |
| download | gitlab-ce-5aa7b13c2ed61f22aa3be48b2ad5fe2ed6ea3a5e.tar.gz | |
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
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -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' diff --git a/Gemfile.lock b/Gemfile.lock index 69804c8c533..924e3a6781a 100644 --- 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) |