change `.` indentation to fix jruby syntax error
This commit is contained in:
parent
93480f138c
commit
0d56f1f90f
|
@ -22,8 +22,8 @@ module Sinatra
|
||||||
# Returns an array of acceptable media types for the response
|
# Returns an array of acceptable media types for the response
|
||||||
def accept
|
def accept
|
||||||
@env['sinatra.accept'] ||= begin
|
@env['sinatra.accept'] ||= begin
|
||||||
@env['HTTP_ACCEPT'].to_s.scan(HEADER_VALUE_WITH_PARAMS)
|
@env['HTTP_ACCEPT'].to_s.scan(HEADER_VALUE_WITH_PARAMS).
|
||||||
.map! { |e| AcceptEntry.new(e) }.sort
|
map! { |e| AcceptEntry.new(e) }.sort
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -804,8 +804,8 @@ module Sinatra
|
||||||
|
|
||||||
# render layout
|
# render layout
|
||||||
if layout
|
if layout
|
||||||
options.merge!(:views => views, :layout => false, :eat_errors => eat_errors, :scope => scope)
|
options.merge!(:views => views, :layout => false, :eat_errors => eat_errors, :scope => scope).
|
||||||
.merge!(layout_options)
|
merge!(layout_options)
|
||||||
catch(:layout_missing) { return render(layout_engine, layout, options, locals) { output } }
|
catch(:layout_missing) { return render(layout_engine, layout, options, locals) { output } }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue