diff --git a/Gemfile b/Gemfile index 4ad3374..3abae66 100644 --- a/Gemfile +++ b/Gemfile @@ -44,7 +44,7 @@ end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo', '~> 0.3.37' gem 'gmaps4rails' -gem 'haml', '~> 4.0.6' +gem 'haml', '~> 5.1.2' gem 'autoprefixer-rails' #gem 'strong_parameters' gem 'protected_attributes' diff --git a/Gemfile.lock b/Gemfile.lock index e036367..84d07f7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -56,6 +56,7 @@ GEM axlsx_rails (0.3.0) axlsx (>= 2.0.1) rails (>= 3.1) + bcrypt (3.1.10) bcrypt (3.1.10-x86-mingw32) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) @@ -93,7 +94,8 @@ GEM execjs (2.5.0) geocoder (1.2.8) gmaps4rails (2.1.2) - haml (4.0.6) + haml (5.1.2) + temple (>= 0.8.0) tilt hike (1.2.3) htmlentities (4.3.3) @@ -117,6 +119,8 @@ GEM minitest (4.7.5) multi_json (1.11.0) nested_form (0.3.2) + nokogiri (1.6.6.2) + mini_portile (~> 0.6.0) nokogiri (1.6.6.2-x86-mingw32) mini_portile (~> 0.6.0) orm_adapter (0.5.0) @@ -125,6 +129,7 @@ GEM activesupport (>= 3.0.0) cocaine (~> 0.5.3) mime-types + pg (0.18.1) pg (0.18.1-x86-mingw32) polyglot (0.3.5) protected_attributes (1.0.3) @@ -177,6 +182,7 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) + temple (0.8.2) thor (0.19.1) thread_safe (0.3.5) tilt (1.4.1) @@ -197,6 +203,7 @@ GEM sprockets-rails (>= 2.0, < 4.0) PLATFORMS + ruby x86-mingw32 DEPENDENCIES @@ -212,7 +219,7 @@ DEPENDENCIES devise geocoder gmaps4rails - haml (~> 4.0.6) + haml (~> 5.1.2) jbuilder (~> 2.0) jquery-rails jquery-ui-rails