diff options
author | ThibG <thib@sitedethib.com> | 2018-05-27 14:24:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-27 14:24:57 +0200 |
commit | 458ec31791bfd5caabeae0c19dcfe074e6b30517 (patch) | |
tree | 1d8350cdad20ad1eb8c67a4d17a18ff7183f22e5 /app/controllers | |
parent | c2e528916cae422baee3d72a3b4409a23c476b3f (diff) | |
parent | 659b8a12ece7110608ee84748e57647c08d1dbda (diff) |
Merge pull request #520 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/application_controller.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 27ebc3333..cc92894a5 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -21,6 +21,7 @@ class ApplicationController < ActionController::Base rescue_from ActionController::RoutingError, with: :not_found rescue_from ActiveRecord::RecordNotFound, with: :not_found rescue_from ActionController::InvalidAuthenticityToken, with: :unprocessable_entity + rescue_from ActionController::UnknownFormat, with: :not_acceptable rescue_from Mastodon::NotPermittedError, with: :forbidden before_action :store_current_location, except: :raise_not_found, unless: :devise_controller? @@ -143,6 +144,10 @@ class ApplicationController < ActionController::Base respond_with_error(422) end + def not_acceptable + respond_with_error(406) + end + def single_user_mode? @single_user_mode ||= Rails.configuration.x.single_user_mode && Account.exists? end |