Commit 26d351dd authored by Douwe Maan's avatar Douwe Maan

Merge branch 'fix-duplication-circuit-breakers' into 'master'

Fix duplication in API::CircuitBreakers

See merge request gitlab-org/gitlab-ce!16456
parents cedbf9c8 b2dcb553
...@@ -17,11 +17,11 @@ module API ...@@ -17,11 +17,11 @@ module API
end end
def storage_health def storage_health
@failing_storage_health ||= Gitlab::Git::Storage::Health.for_all_storages @storage_health ||= Gitlab::Git::Storage::Health.for_all_storages
end end
end end
desc 'Get all failing git storages' do desc 'Get all git storages' do
detail 'This feature was introduced in GitLab 9.5' detail 'This feature was introduced in GitLab 9.5'
success Entities::RepositoryStorageHealth success Entities::RepositoryStorageHealth
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment