diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-01-04 18:24:39 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-01-09 10:02:52 +0100 |
| commit | c28b0a539dcbbec8ba487067ff315cb5d57e5bdb (patch) | |
| tree | d1db4aba7fc14ff9766b2fb384b3c718d099fb4f /lib/api/api.rb | |
| parent | 8ab94120ee0a87c7b1158ebafea101e3952ec758 (diff) | |
| download | gitlab-ce-c28b0a539dcbbec8ba487067ff315cb5d57e5bdb.tar.gz | |
Don't instrument 405 Grape calls26051-fix-missing-endpoint-route-method
Fixes #26051.
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'lib/api/api.rb')
| -rw-r--r-- | lib/api/api.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb index 9d5adffd8f4..6cf6b501021 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -14,7 +14,11 @@ module API end # Retain 405 error rather than a 500 error for Grape 0.15.0+. - # See: https://github.com/ruby-grape/grape/commit/252bfd27c320466ec3c0751812cf44245e97e5de + # https://github.com/ruby-grape/grape/blob/a3a28f5b5dfbb2797442e006dbffd750b27f2a76/UPGRADING.md#changes-to-method-not-allowed-routes + rescue_from Grape::Exceptions::MethodNotAllowed do |e| + error! e.message, e.status, e.headers + end + rescue_from Grape::Exceptions::Base do |e| error! e.message, e.status, e.headers end |