diff --git a/Gemfile b/Gemfile index 266373a3f6..5d2560122b 100644 --- a/Gemfile +++ b/Gemfile @@ -22,7 +22,7 @@ gem 'rails-i18n' gem 'mysql2', '~> 0.4.0' # for compatibility with rails 4 gem 'prawn' gem 'prawn-table' -gem 'haml', '~> 4.0' # some breaking changes in version 5, remove this line again when fixed +gem 'haml', '~> 5.1' # some breaking changes in version 5, remove this line again when fixed gem 'haml-rails' gem 'kaminari' gem 'simple_form' diff --git a/Gemfile.lock b/Gemfile.lock index afa1da93b0..e7d28d7c1b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -221,7 +221,8 @@ GEM rails (>= 4.0.0) globalid (0.4.2) activesupport (>= 4.2.0) - haml (4.0.7) + haml (5.1.2) + temple (>= 0.8.0) tilt haml-rails (1.0.0) actionpack (>= 4.0.1) @@ -509,6 +510,7 @@ GEM sqlite3 (1.3.13) sqlite3-ruby (1.3.3) sqlite3 (>= 1.3.3) + temple (0.8.2) term-ansicolor (1.2.2) tins (~> 0.8) therubyracer (0.12.3) @@ -598,7 +600,7 @@ DEPENDENCIES foodsoft_printer! foodsoft_wiki! gaffe - haml (~> 4.0) + haml (~> 5.1) haml-rails hashie (~> 3.4.6) i18n-js (~> 3.0.0.rc8)