kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Bump health_check gem to version 2.6.0

This commit is contained in:
Douglas Barbosa Alexandre 2017-03-03 15:44:08 -03:00
parent afd566347f
commit 0fcb8ce7d6
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -344,7 +344,7 @@ gem 'oauth2', '~> 1.2.0'
gem 'paranoia', '~> 2.2' gem 'paranoia', '~> 2.2'
# Health check # Health check
gem 'health_check', '~> 2.2.0' gem 'health_check', '~> 2.6.0'
# System information # System information
gem 'vmstat', '~> 2.3.0' gem 'vmstat', '~> 2.3.0'

4
Gemfile.lock
View File

@ -336,7 +336,7 @@ GEM
thor thor
tilt tilt
hashie (3.5.5) hashie (3.5.5)
health_check (2.2.1) health_check (2.6.0)
rails (>= 4.0) rails (>= 4.0)
hipchat (1.5.2) hipchat (1.5.2)
httparty httparty
@ -895,7 +895,7 @@ DEPENDENCIES
grape-entity (~> 0.6.0) grape-entity (~> 0.6.0)
haml_lint (~> 0.21.0) haml_lint (~> 0.21.0)
hamlit (~> 2.6.1) hamlit (~> 2.6.1)
health_check (~> 2.2.0) health_check (~> 2.6.0)
hipchat (~> 1.5.0) hipchat (~> 1.5.0)
html-pipeline (~> 1.11.0) html-pipeline (~> 1.11.0)
html2text html2text

2
app/controllers/admin/health_check_controller.rb
View File

@ -1,5 +1,5 @@
class Admin::HealthCheckController < Admin::ApplicationController class Admin::HealthCheckController < Admin::ApplicationController
def show def show
@errors = HealthCheck::Utils.process_checks('standard') @errors = HealthCheck::Utils.process_checks(['standard'])
end end
end end

4
spec/controllers/health_check_controller_spec.rb
View File

@ -64,8 +64,8 @@ describe HealthCheckController do
context 'when a service is down and an access token is provided' do context 'when a service is down and an access token is provided' do
before do before do
allow(HealthCheck::Utils).to receive(:process_checks).with('standard').and_return('The server is on fire') allow(HealthCheck::Utils).to receive(:process_checks).with(['standard']).and_return('The server is on fire')
allow(HealthCheck::Utils).to receive(:process_checks).with('email').and_return('Email is on fire') allow(HealthCheck::Utils).to receive(:process_checks).with(['email']).and_return('Email is on fire')
end end
it 'supports passing the token in the header' do it 'supports passing the token in the header' do