diff options
author | ThibG <thib@sitedethib.com> | 2019-12-12 16:10:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-12 16:10:58 +0100 |
commit | c1befd3909359e4d964da74bde9931a8416d26a3 (patch) | |
tree | 7eb7528245c671cdf908e07c3d630e7639d575bb /app/controllers | |
parent | 246addd5b33a172600342af3fb6fb5e4c80ad95e (diff) | |
parent | be4849c08306cce930ea27e1f8097ffb774f75c6 (diff) |
Merge pull request #1252 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/application_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 599c64062..f1a4f0d02 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -212,6 +212,6 @@ class ApplicationController < ActionController::Base def respond_with_error(code) use_pack 'error' - render "errors/#{code}", layout: 'error', status: code + render "errors/#{code}", layout: 'error', status: code, formats: [:html] end end |