Merge branch 'master' into fl-fix-annoying-actionsfl-fix-annoying-actions

* master: (91 commits)
  [Rails5] Update `type_cast_*_database`  methods
  Add confirmation modal to "Change username"
  Add noteableType to mock data object
  Set `noteable_type` to use in notesApp
  Return noteableType from app initial config
  Use noteable type map from constants
  Add map for supported noteable types
  Polish design of domain verification for Gitlab Pages
  Add changelog item
  Resolve "Show `failure_reason` and upgrade tooltips of jobs"
  Include subgroup issues when searching for group issues using the API
  Use the GitLab version as part of the appearances cache key
  Fix rubocop
  Fix rubocop
  Deleting a MR you are assigned to should decrements counter
  Improve specs and docs
  Fix more specs
  Fix specs
  Show issues of subgroups in group-level issue board
  Override the Prometheus server name
  ...

1 files changed, 8 insertions, 0 deletions

diff --git a/lib/api/api.rb b/lib/api/api.rb
index 62ffebeacb0..073471b4c4d 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -78,6 +78,14 @@ module API
       rack_response({ 'message' => '404 Not found' }.to_json, 404)
     end
 
+    rescue_from UploadedFile::InvalidPathError do |e|
+      rack_response({ 'message' => e.message }.to_json, 400)
+    end
+
+    rescue_from ObjectStorage::RemoteStoreError do |e|
+      rack_response({ 'message' => e.message }.to_json, 500)
+    end
+
     # Retain 405 error rather than a 500 error for Grape 0.15.0+.
     # https://github.com/ruby-grape/grape/blob/a3a28f5b5dfbb2797442e006dbffd750b27f2a76/UPGRADING.md#changes-to-method-not-allowed-routes
     rescue_from Grape::Exceptions::MethodNotAllowed do |e|