diff --git a/Gemfile b/Gemfile index 4e1c4bf..34249b3 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ gem 'rails', '4.2.8' gem 'sprockets-rails', '~> 3.2' # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' -gem 'haml', '~> 4.0', '>= 4.0.7' +gem 'haml', '~> 5.0' gem 'bootstrap-sass', '~> 3.3', '>= 3.3.6' gem 'font-awesome-sass' # gem "animate-rails" diff --git a/Gemfile.lock b/Gemfile.lock index 448bdaf..05d647f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -80,7 +80,8 @@ GEM sassc (>= 1.11) globalid (0.4.2) activesupport (>= 4.2.0) - haml (4.0.7) + haml (5.0.0) + temple (>= 0.8.0) tilt i18n (0.9.5) concurrent-ruby (~> 1.0) @@ -171,6 +172,7 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) + temple (0.8.2) thor (1.1.0) thread_safe (0.3.6) tilt (2.0.10) @@ -202,7 +204,7 @@ DEPENDENCIES coffee-rails (~> 4.1.0) devise! font-awesome-sass - haml (~> 4.0, >= 4.0.7) + haml (~> 5.0) jbuilder (~> 2.0) jquery-rails pg (~> 0.15)