1 files changed, 47 insertions, 2 deletions

diff --git a/lib/api/api.rb b/lib/api/api.rb
index 6cf6b501021..1bf20f76ad6 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -1,7 +1,47 @@
 module API
   class API < Grape::API
     include APIGuard
-    version 'v3', using: :path
+
+    version %w(v3 v4), using: :path
+
+    version 'v3', using: :path do
+      helpers ::API::V3::Helpers
+
+      mount ::API::V3::AwardEmoji
+      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
+      mount ::API::V3::Files
+      mount ::API::V3::Groups
+      mount ::API::V3::Issues
+      mount ::API::V3::Labels
+      mount ::API::V3::Members
+      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
+      mount ::API::V3::ProjectSnippets
+      mount ::API::V3::Repositories
+      mount ::API::V3::Runners
+      mount ::API::V3::Services
+      mount ::API::V3::Settings
+      mount ::API::V3::Snippets
+      mount ::API::V3::Subscriptions
+      mount ::API::V3::SystemHooks
+      mount ::API::V3::Tags
+      mount ::API::V3::Templates
+      mount ::API::V3::Todos
+      mount ::API::V3::Triggers
+      mount ::API::V3::Users
+      mount ::API::V3::Variables
+    end
 
     before { allow_access_with_scope :api }
 
@@ -23,6 +63,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
@@ -40,7 +84,6 @@ module API
     mount ::API::Boards
     mount ::API::Branches
     mount ::API::BroadcastMessages
-    mount ::API::Builds
     mount ::API::Commits
     mount ::API::CommitStatuses
     mount ::API::DeployKeys
@@ -50,6 +93,7 @@ module API
     mount ::API::Groups
     mount ::API::Internal
     mount ::API::Issues
+    mount ::API::Jobs
     mount ::API::Keys
     mount ::API::Labels
     mount ::API::Lint
@@ -65,6 +109,7 @@ module API
     mount ::API::Projects
     mount ::API::ProjectSnippets
     mount ::API::Repositories
+    mount ::API::Runner
     mount ::API::Runners
     mount ::API::Services
     mount ::API::Session