Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
460c5c4a
Commit
460c5c4a
authored
May 27, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
70b85a5f
f9a2c403
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
91 deletions
+5
-91
changelogs/unreleased/chore-remove-circuit-breaker-api.yml
changelogs/unreleased/chore-remove-circuit-breaker-api.yml
+5
-0
doc/api/repository_storage_health.md
doc/api/repository_storage_health.md
+0
-5
lib/api/api.rb
lib/api/api.rb
+0
-1
lib/api/circuit_breakers.rb
lib/api/circuit_breakers.rb
+0
-39
spec/requests/api/circuit_breakers_spec.rb
spec/requests/api/circuit_breakers_spec.rb
+0
-46
No files found.
changelogs/unreleased/chore-remove-circuit-breaker-api.yml
0 → 100644
View file @
460c5c4a
---
title
:
Remove the circuit breaker API
merge_request
:
28669
author
:
type
:
removed
doc/api/repository_storage_health.md
deleted
100644 → 0
View file @
70b85a5f
# Circuitbreaker API
NOTE:
**Deprecated:**
Support of the circuit breaker is removed, as Gitaly can be configured to
to work without NFS and
[
communicate solely over HTTP
](
../administration/gitaly/index.md
)
.
lib/api/api.rb
View file @
460c5c4a
...
...
@@ -98,7 +98,6 @@ module API
mount
::
API
::
Boards
mount
::
API
::
Branches
mount
::
API
::
BroadcastMessages
mount
::
API
::
CircuitBreakers
mount
::
API
::
Commits
mount
::
API
::
CommitStatuses
mount
::
API
::
ContainerRegistry
...
...
lib/api/circuit_breakers.rb
deleted
100644 → 0
View file @
70b85a5f
# frozen_string_literal: true
module
API
class
CircuitBreakers
<
Grape
::
API
before
{
authenticated_as_admin!
}
resource
:circuit_breakers
do
params
do
requires
:type
,
type:
String
,
desc:
"The type of circuitbreaker"
,
values:
[
'repository_storage'
]
end
resource
':type'
do
namespace
''
,
requirements:
{
type:
'repository_storage'
}
do
desc
'Get all git storages'
do
detail
'This feature was introduced in GitLab 9.5'
end
get
do
present
[]
end
desc
'Get all failing git storages'
do
detail
'This feature was introduced in GitLab 9.5'
end
get
'failing'
do
present
[]
end
desc
'Reset all storage failures and open circuitbreaker'
do
detail
'This feature was introduced in GitLab 9.5'
end
delete
do
end
end
end
end
end
end
spec/requests/api/circuit_breakers_spec.rb
deleted
100644 → 0
View file @
70b85a5f
require
'spec_helper'
describe
API
::
CircuitBreakers
do
set
(
:user
)
{
create
(
:user
)
}
set
(
:admin
)
{
create
(
:admin
)
}
describe
'GET circuit_breakers/repository_storage'
do
it
'returns a 401 for anonymous users'
do
get
api
(
'/circuit_breakers/repository_storage'
)
expect
(
response
).
to
have_gitlab_http_status
(
401
)
end
it
'returns a 403 for users'
do
get
api
(
'/circuit_breakers/repository_storage'
,
user
)
expect
(
response
).
to
have_gitlab_http_status
(
403
)
end
it
'returns an Array of storages'
do
get
api
(
'/circuit_breakers/repository_storage'
,
admin
)
expect
(
response
).
to
have_gitlab_http_status
(
200
)
expect
(
json_response
).
to
be_kind_of
(
Array
)
expect
(
json_response
).
to
be_empty
end
describe
'GET circuit_breakers/repository_storage/failing'
do
it
'returns an array of failing storages'
do
get
api
(
'/circuit_breakers/repository_storage/failing'
,
admin
)
expect
(
response
).
to
have_gitlab_http_status
(
200
)
expect
(
json_response
).
to
be_kind_of
(
Array
)
expect
(
json_response
).
to
be_empty
end
end
end
describe
'DELETE circuit_breakers/repository_storage'
do
it
'clears all circuit_breakers'
do
delete
api
(
'/circuit_breakers/repository_storage'
,
admin
)
expect
(
response
).
to
have_gitlab_http_status
(
204
)
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment