diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-05-12 16:39:03 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-05-12 16:39:03 -0500 |
| commit | 7fc51d1908a1ce7b0a09f273881c08102efd1dae (patch) | |
| tree | ec761b8751c914c8eee39912537bbcbebd09d273 /Gemfile.lock | |
| parent | 74c69709dc19dbaf56c226b5a7955f229af10f4f (diff) | |
| parent | ad77ab0376fabf3dfadea86c716358964b526956 (diff) | |
| download | gitlab-ce-7fc51d1908a1ce7b0a09f273881c08102efd1dae.tar.gz | |
Merge branch 'health-check-route'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index bc47533e5bb..ce1da92e517 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -402,6 +402,8 @@ GEM html2haml (>= 1.0.1) railties (>= 4.0.1) hashie (3.4.3) + health_check (1.5.1) + rails (>= 2.3.0) highline (1.7.8) hipchat (1.5.2) httparty @@ -945,6 +947,7 @@ DEPENDENCIES grape (~> 0.13.0) grape-entity (~> 0.4.2) haml-rails (~> 0.9.0) + health_check (~> 1.5.1) hipchat (~> 1.5.0) html-pipeline (~> 1.11.0) httparty (~> 0.13.3) |