Fix specs
This commit is contained in:
parent
9727366b5a
commit
241cca011f
|
@ -115,10 +115,10 @@ class ApplicationController < ActionController::Base
|
|||
|
||||
def render_404
|
||||
respond_to do |format|
|
||||
format.json { head :not_found }
|
||||
format.any do
|
||||
format.html do
|
||||
render file: Rails.root.join("public", "404"), layout: false, status: "404"
|
||||
end
|
||||
format.any { head :not_found }
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -26,10 +26,10 @@ module TestEnv
|
|||
'expand-collapse-lines' => '238e82d',
|
||||
'video' => '8879059',
|
||||
'crlf-diff' => '5938907',
|
||||
'conflict-start' => '75284c7',
|
||||
'conflict-start' => '824be60',
|
||||
'conflict-resolvable' => '1450cd6',
|
||||
'conflict-binary-file' => '259a6fb',
|
||||
'conflict-contains-conflict-markers' => '5e0964c',
|
||||
'conflict-contains-conflict-markers' => '78a3086',
|
||||
'conflict-missing-side' => 'eb227b3',
|
||||
'conflict-non-utf8' => 'd0a293c',
|
||||
'conflict-too-large' => '39fa04f',
|
||||
|
|
Loading…
Reference in New Issue