diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-17 19:05:49 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-17 19:05:49 +0300 |
| commit | 43a25d93ebdabea52f99b05e15b06250cd8f07d7 (patch) | |
| tree | dceebdc68925362117480a5d672bcff122fb625b /lib/api/api.rb | |
| parent | 20c84b99005abd1c82101dfeff264ac50d2df211 (diff) | |
Add latest changes from gitlab-org/gitlab@16-0-stable-eev16.0.0-rc42
Diffstat (limited to 'lib/api/api.rb')
| -rw-r--r-- | lib/api/api.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb index 4b7fe6bdc7a..f50c705c3ea 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -134,6 +134,10 @@ module API rack_response({ 'message' => '403 Forbidden' }.to_json, 403) end + rescue_from Gitlab::Git::ResourceExhaustedError do |exception| + rack_response({ 'message' => exception.message }.to_json, 429, exception.headers) + end + rescue_from :all do |exception| handle_api_exception(exception) end @@ -234,6 +238,9 @@ module API mount ::API::ImportBitbucketServer mount ::API::ImportGithub mount ::API::Integrations + mount ::API::Integrations::Slack::Events + mount ::API::Integrations::Slack::Interactions + mount ::API::Integrations::Slack::Options mount ::API::Integrations::JiraConnect::Subscriptions mount ::API::Invitations mount ::API::IssueLinks @@ -265,6 +272,7 @@ module API mount ::API::ProjectExport mount ::API::ProjectHooks mount ::API::ProjectImport + mount ::API::ProjectJobTokenScope mount ::API::ProjectPackages mount ::API::ProjectRepositoryStorageMoves mount ::API::ProjectSnippets @@ -335,7 +343,7 @@ module API mount ::API::Todos mount ::API::UsageData mount ::API::UsageDataNonSqlMetrics - mount ::API::Ml::Mlflow + mount ::API::Ml::Mlflow::Entrypoint end mount ::API::Internal::Base |