Unfloyded/Legamunt
0
0
Fork 0
Code Activity

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

Browse source 
Conflicts:
- app/controllers/application_controller.rb
  Minor conflict due to glitch-soc's theming system
This commit is contained in:
Thibaut Girka 2019-12-12 15:40:06 +01:00
commit be4849c083
10 changed files with 281 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/application_controller.rb
View file

@ -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