diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-10-28 08:37:49 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-28 08:37:49 +0100 |
commit | b00f60f1d3d5415b5fd536191a7ee183ae910d03 (patch) | |
tree | fa36e5f3ef4128cbf6c55b88e4ea1ddaa2dc161e /app/controllers | |
parent | 008f98b30481dff2278d0687deb874f05de66b75 (diff) | |
parent | 26fe37c41460d6db3b5dd975a86c14fdd8dfadf3 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/application_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index dca6c5a5a..983b116c9 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -201,6 +201,7 @@ class ApplicationController < ActionController::Base def respond_with_error(code) respond_to do |format| format.any { head code } + format.html do set_locale use_pack 'error' |