X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9f57f60b87ff55a4ba69db3afadb21bbbdcb3385..071f61e3ade9cbe5956216990ee2699ff5993f62:/app/controllers/application_controller.rb?ds=sidebyside diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index bee5e8169..045e93eb7 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -10,7 +10,9 @@ class ApplicationController < ActionController::Base around_action :better_errors_allow_inline, :if => proc { Rails.env.development? } attr_accessor :current_user + helper_method :current_user + helper_method :preferred_langauges private @@ -185,6 +187,8 @@ class ApplicationController < ActionController::Base def api_call_handle_error yield + rescue ActionController::UnknownFormat + head :not_acceptable rescue ActiveRecord::RecordNotFound => e head :not_found rescue LibXML::XML::Error, ArgumentError => e