Merge branch 'master' into glitch-soc/merge-upstream

2018-10-28 08:37:49 +01:00
parent 008f98b304 26fe37c414
commit b00f60f1d3
44 changed files with 267 additions and 256 deletions
--- 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'