diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-01-16 14:21:44 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-01-16 14:21:44 +0100 |
| commit | 4657c28777dfc2729261f895f8e36cbef51395bc (patch) | |
| tree | 86c2483e843be06ad10c0f0b43f6a20da3a5a6b8 /lib/api/api.rb | |
| parent | 5456859b5b28baca95ced74179a349563498a5f0 (diff) | |
| parent | daaaf5ef9f182761ac07d76d24d971765134c7e1 (diff) | |
| download | gitlab-ce-fix/keep-artifacts-button-visibility.tar.gz | |
Merge branch 'master' into fix/keep-artifacts-button-visibilityfix/keep-artifacts-button-visibility
* master: (579 commits)
Conflicts:
spec/models/build_spec.rb
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 |