diff options
| author | Valery Sizov <valery@gitlab.com> | 2017-03-06 18:50:59 +0200 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2017-03-06 18:50:59 +0200 |
| commit | 710e4df933ba2070dcc104a18de834c23dd1e5be (patch) | |
| tree | dee3817e1ddc46179cdb6e0b3008a9e94b5440d5 /lib/api/api.rb | |
| parent | 13caadea7a123d1dc5f3475d360cd07f1aef4acb (diff) | |
| parent | b63c41e12e9e6f7e9fd1d79bedf56bd42cc17035 (diff) | |
| download | gitlab-ce-710e4df933ba2070dcc104a18de834c23dd1e5be.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues
Diffstat (limited to 'lib/api/api.rb')
| -rw-r--r-- | lib/api/api.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb index 3e53ab693ab..8dbe8875fe8 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -9,6 +9,7 @@ module API mount ::API::V3::Boards mount ::API::V3::Branches mount ::API::V3::BroadcastMessages + mount ::API::V3::Builds mount ::API::V3::Commits mount ::API::V3::DeployKeys mount ::API::V3::Environments @@ -20,6 +21,7 @@ module API mount ::API::V3::MergeRequestDiffs mount ::API::V3::MergeRequests mount ::API::V3::Notes + mount ::API::V3::Pipelines mount ::API::V3::ProjectHooks mount ::API::V3::Milestones mount ::API::V3::Projects @@ -59,6 +61,10 @@ module API error! e.message, e.status, e.headers end + rescue_from Gitlab::Auth::TooManyIps do |e| + rack_response({ 'message' => '403 Forbidden' }.to_json, 403) + end + rescue_from :all do |exception| handle_api_exception(exception) end @@ -76,7 +82,6 @@ module API mount ::API::Boards mount ::API::Branches mount ::API::BroadcastMessages - mount ::API::Builds mount ::API::Commits mount ::API::CommitStatuses mount ::API::DeployKeys @@ -86,6 +91,7 @@ module API mount ::API::Groups mount ::API::Internal mount ::API::Issues + mount ::API::Jobs mount ::API::Keys mount ::API::Labels mount ::API::Lint |