Commit 3708f870 authored by paz's avatar paz

Update haml-rails and dependencies (incl haml)

parent 30f6a695
Pipeline #31431 passed with stages
in 5 minutes
......@@ -4,7 +4,7 @@ gem 'rake'
gem 'rails', '~> 4.2'
gem 'bcrypt', '~> 3.1'
gem 'activeresource', '~> 4.0'
gem 'haml-rails', '~> 0.9'
gem 'haml-rails', '~> 1.0.0'
gem 'sass-rails', '~> 5.0'
gem 'bootstrap-sass', '~> 3.3'
gem 'simple_form', '~> 3.2'
......
......@@ -78,12 +78,13 @@ GEM
ffi (1.10.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
haml (4.0.7)
haml (5.1.2)
temple (>= 0.8.0)
tilt
haml-rails (0.9.0)
haml-rails (1.0.0)
actionpack (>= 4.0.1)
activesupport (>= 4.0.1)
haml (>= 4.0.6, < 5.0)
haml (>= 4.0.6, < 6.0)
html2haml (>= 1.0.1)
railties (>= 4.0.1)
hashdiff (0.3.9)
......@@ -160,7 +161,7 @@ GEM
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.0)
ruby_parser (3.13.1)
ruby_parser (3.14.1)
sexp_processor (~> 4.9)
safe_yaml (1.0.5)
sass (3.7.4)
......@@ -177,7 +178,7 @@ GEM
sassc (2.0.1)
ffi (~> 1.9)
rake
sexp_processor (4.12.0)
sexp_processor (4.13.0)
simple_form (3.5.1)
actionpack (> 4, < 5.2)
activemodel (> 4, < 5.2)
......@@ -197,13 +198,14 @@ GEM
sqlite3 (1.3.13)
squire (1.3.7)
activesupport (>= 3.0.0)
temple (0.8.2)
thin (1.7.2)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.9)
tilt (2.0.10)
tzinfo (1.2.5)
thread_safe (~> 0.1)
webmock (3.5.1)
......@@ -225,7 +227,7 @@ DEPENDENCIES
cancancan (~> 1.9)
capybara (~> 3.15.0)
factory_bot_rails
haml-rails (~> 0.9)
haml-rails (~> 1.0.0)
launchy
rails (~> 4.2)
rake
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment