summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-01-15 12:31:07 +0000
committerDouwe Maan <douwe@gitlab.com>2018-01-15 12:31:07 +0000
commit26d351ddee5c036a24ff65f3b123290550f2d1f6 (patch)
treefe7b363ec2ea1e3f2b82275fdb9476b5446ff001
parentcedbf9c8b4a650a5a62adfd6b62df81c08896806 (diff)
parentb2dcb553160613220734bfd748cba40fa3c07605 (diff)
downloadgitlab-ce-26d351ddee5c036a24ff65f3b123290550f2d1f6.tar.gz
Merge branch 'fix-duplication-circuit-breakers' into 'master'
Fix duplication in API::CircuitBreakers See merge request gitlab-org/gitlab-ce!16456
-rw-r--r--lib/api/circuit_breakers.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/circuit_breakers.rb b/lib/api/circuit_breakers.rb
index 598c76f6168..c13154dc0ec 100644
--- a/lib/api/circuit_breakers.rb
+++ b/lib/api/circuit_breakers.rb
@@ -17,11 +17,11 @@ module API
end
def storage_health
- @failing_storage_health ||= Gitlab::Git::Storage::Health.for_all_storages
+ @storage_health ||= Gitlab::Git::Storage::Health.for_all_storages
end
end
- desc 'Get all failing git storages' do
+ desc 'Get all git storages' do
detail 'This feature was introduced in GitLab 9.5'
success Entities::RepositoryStorageHealth
end