summaryrefslogtreecommitdiff
path: root/lib/api/api.rb
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-08-07 14:56:15 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-08-07 14:56:15 +0000
commit5bf65c9306960cdbe9b64bf8f62dc909d1cc6440 (patch)
tree22a4b3a199fae27c64e849c6f8c805c2b5008e5c /lib/api/api.rb
parentfa716921b8b136f5d4b09de9723568d5ac101f84 (diff)
parentfda83a6179ae63f094410942e95951b40c3ad24b (diff)
downloadgitlab-ce-5bf65c9306960cdbe9b64bf8f62dc909d1cc6440.tar.gz
Merge branch 'bvl-nfs-circuitbreaker' into 'master'
Circuitbreaker for storage paths Closes #32207, #33117, gitlab-com/infrastructure#1946, and gitlab-com/infrastructure#1775 See merge request !11449
Diffstat (limited to 'lib/api/api.rb')
-rw-r--r--lib/api/api.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb
index 982a2b88d62..94df543853b 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -95,6 +95,7 @@ module API
mount ::API::Boards
mount ::API::Branches
mount ::API::BroadcastMessages
+ mount ::API::CircuitBreakers
mount ::API::Commits
mount ::API::CommitStatuses
mount ::API::DeployKeys