diff --git a/Gemfile b/Gemfile index 81e191e..68e9417 100644 --- a/Gemfile +++ b/Gemfile @@ -21,7 +21,7 @@ group :assets do end gem 'jquery-rails' -gem "haml", "~> 4.0.0" +gem "haml", "~> 5.0.0" gem "simple_form", "~> 2.1.0" gem "cancan", "~> 1.6.9" diff --git a/Gemfile.lock b/Gemfile.lock index 93e76bc..4d0d822 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,16 +64,8 @@ GEM coffee-script-source execjs coffee-script-source (1.6.1) - columnize (0.3.6) database_cleaner (0.9.1) debug_inspector (0.0.2) - debugger (1.4.0) - columnize (>= 0.3.1) - debugger-linecache (~> 1.1.1) - debugger-ruby_core_source (~> 1.2.0) - debugger-linecache (1.1.2) - debugger-ruby_core_source (>= 1.1.1) - debugger-ruby_core_source (1.2.0) diff-lcs (1.2.1) erubis (2.7.0) execjs (1.4.0) @@ -99,7 +91,8 @@ GEM childprocess (>= 0.2.3) guard (>= 1.1) spork (>= 0.8.4) - haml (4.0.0) + haml (5.0.0) + temple (>= 0.8.0) tilt highline (1.6.15) hike (1.2.1) @@ -205,12 +198,13 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) + temple (0.8.2) terminal-table (1.4.5) therubyracer (0.11.4) libv8 (~> 3.11.8.12) ref thor (0.17.0) - tilt (1.3.5) + tilt (1.4.1) treetop (1.4.12) polyglot polyglot (>= 0.3.1) @@ -236,12 +230,11 @@ DEPENDENCIES capybara (~> 2.0.2) coffee-rails (~> 3.2.1) database_cleaner (~> 0.9.1) - debugger factory_girl_rails (~> 4.2.1) faker (~> 1.1.2) guard-rspec (~> 2.5.0) guard-spork (~> 1.5.0) - haml (~> 4.0.0) + haml (~> 5.0.0) highline (~> 1.6.15) jquery-rails launchy (~> 2.2.0)