mirrors/retrospring
1
0
Fork 0
mirror of https://github.com/Retrospring/retrospring.git synced 2025-01-31 12:59:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #742 from Retrospring/dependabot/bundler/haml-6.0.7

Browse source 
Bump haml from 5.2.2 to 6.0.7
This commit is contained in:
Georg Gadinger 2022-10-25 19:58:19 +02:00 • committed by GitHub
commit e28da8776f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -26,7 +26,7 @@ gem "devise-i18n"
gem "fog-aws" gem "fog-aws"
gem "fog-core" gem "fog-core"
gem "fog-local" gem "fog-local"
gem "haml", "~> 5.0" gem "haml", "~> 6.0"
gem "hcaptcha", "~> 7.0" gem "hcaptcha", "~> 7.0"
gem "mini_magick" gem "mini_magick"
gem "oj" gem "oj"

9
Gemfile.lock
View file

@ -213,8 +213,9 @@ GEM
guard (>= 2.0.0) guard (>= 2.0.0)
guard-compat (~> 1.0) guard-compat (~> 1.0)
guard-compat (1.2.1) guard-compat (1.2.1)
haml (5.2.2) haml (6.0.7)
temple (>= 0.8.0) temple (>= 0.8.2)
thor
tilt tilt
haml_lint (0.42.0) haml_lint (0.42.0)
haml (>= 4.0, < 6.1) haml (>= 4.0, < 6.1)
@ -512,7 +513,7 @@ GEM
activesupport (>= 5.2) activesupport (>= 5.2)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
sysexits (1.2.0) sysexits (1.2.0)
temple (0.8.2) temple (0.9.1)
thor (1.2.1) thor (1.2.1)
thread_safe (0.3.6) thread_safe (0.3.6)
tilt (2.0.11) tilt (2.0.11)
@ -594,7 +595,7 @@ DEPENDENCIES
fog-core fog-core
fog-local fog-local
guard-brakeman guard-brakeman
haml (~> 5.0) haml (~> 6.0)
haml_lint haml_lint
hcaptcha (~> 7.0) hcaptcha (~> 7.0)
httparty httparty

1
app/helpers/layouts_helper.rb
View file

@ -4,7 +4,6 @@ module LayoutsHelper
def parent_layout(layout) def parent_layout(layout)
@view_flow.set(:layout, output_buffer) @view_flow.set(:layout, output_buffer)
output = render(template: "layouts/#{layout}") output = render(template: "layouts/#{layout}")
@haml_buffer.buffer.replace output
self.output_buffer = ActionView::OutputBuffer.new(output) self.output_buffer = ActionView::OutputBuffer.new(output)
end end
end end