Merge branch 'release/0.6.15.1'

ulmic · Apr 24, 2016 · 3b324cb · 3b324cb
2 parents 3e4da80 + 71b8a1e
commit 3b324cb
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/controllers/web/application_controller.rb b/app/controllers/web/application_controller.rb
@@ -13,7 +13,7 @@ class Web::ApplicationController < ApplicationController
     rescue_from ActionView::MissingTemplate, ActiveRecord::RecordNotFound, NoMethodError do |exception|
       Rails.logger.warn "ERROR MESSAGE: #{exception.message}"
       Rails.logger.warn "BACKTRACE: #{exception.backtrace.first(30).join("\n")}"
-      render '/web/pages/shared/_server_error', status: 500
+      render html: '/web/pages/shared/_server_error', status: 500
     end
   end