summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDJ Mountney <david@twkie.net>2016-07-11 09:06:36 -0700
committerDJ Mountney <david@twkie.net>2016-07-11 09:30:47 -0700
commitd2f003a344e6f29a0ad5115c7d8dec5727b87895 (patch)
tree738f029fe51f1b57bef9a711854033f2ced028ab /Gemfile.lock
parent3239c5f666fb93cbd66cf9b1d02b8a9d6e8b0d51 (diff)
downloadgitlab-ce-d2f003a344e6f29a0ad5115c7d8dec5727b87895.tar.gz
Update the health_check gem to the latest releaseupdate-health-check-gem
This allows us to drop our disable email config override
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock6
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 721ab9ddc5d..f8018e58a5e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -322,8 +322,8 @@ GEM
thor
tilt
hashie (3.4.3)
- health_check (1.5.1)
- rails (>= 2.3.0)
+ health_check (2.1.0)
+ rails (>= 4.0)
hipchat (1.5.2)
httparty
mimemagic
@@ -870,7 +870,7 @@ DEPENDENCIES
grape (~> 0.13.0)
grape-entity (~> 0.4.2)
hamlit (~> 2.5)
- health_check (~> 1.5.1)
+ health_check (~> 2.1.0)
hipchat (~> 1.5.0)
html-pipeline (~> 1.11.0)
httparty (~> 0.13.3)