diff --git a/Gemfile b/Gemfile index 24ddb1f..2b38dd8 100644 --- a/Gemfile +++ b/Gemfile @@ -12,8 +12,8 @@ gem 'yajl-ruby', '1.1.0', :require => 'yajl' gem "jquery-rails", "1.0.19" group :assets do - gem 'sass-rails', "~> 3.2.5" - gem 'coffee-rails', "~> 3.2.1" + gem 'sass-rails', '~> 3.2.5' + gem 'coffee-rails', '~> 3.2.2' gem 'uglifier' gem "yui-compressor" end diff --git a/Gemfile.lock b/Gemfile.lock index c01079b..56ffa34 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -33,12 +33,12 @@ GEM i18n (~> 0.6) multi_json (~> 1.0) addressable (2.2.7) - arel (3.0.2) + arel (3.0.3) bourbon (2.1.0) sass (>= 3.1) bourne (1.1.1) mocha (= 0.10.4) - builder (3.0.0) + builder (3.0.4) capybara (1.1.2) mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -54,10 +54,11 @@ GEM coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) - coffee-script (2.2.0) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.3.1) + coffee-script-source (1.12.2) + concurrent-ruby (1.1.3) cucumber (1.1.9) builder (>= 2.1.2) diff-lcs (>= 1.1.2) @@ -74,9 +75,8 @@ GEM dynamic_form (1.1.4) erubis (2.7.0) eventmachine (0.12.10) - execjs (1.3.2) - multi_json (~> 1.0) - factory_girl (2.6.3) + execjs (2.7.0) + factory_girl (2.6.4) activesupport (>= 2.3.9) factory_girl_rails (1.7.0) factory_girl (~> 2.6.0) @@ -91,14 +91,15 @@ GEM rails (~> 3.0) gherkin (2.9.0) json (>= 1.4.6) - hike (1.2.1) + hike (1.2.3) htmldiff (0.0.1) - i18n (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) jquery-rails (1.0.19) railties (~> 3.0) thor (~> 0.14) - json (1.7.3) + json (1.8.6) launchy (2.0.5) addressable (~> 2.2.6) libwebsocket (0.1.3) @@ -108,20 +109,20 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) metaclass (0.0.1) - mime-types (1.19) + mime-types (1.25.1) mocha (0.10.4) metaclass (~> 0.0.1) - multi_json (1.3.6) + multi_json (1.13.1) nokogiri (1.5.4) open4 (1.3.0) pg (0.13.2) - polyglot (0.3.3) - rack (1.4.1) - rack-cache (1.2) + polyglot (0.3.5) + rack (1.4.7) + rack-cache (1.8.0) rack (>= 0.4) - rack-ssl (1.3.2) + rack-ssl (1.3.4) rack - rack-test (0.6.1) + rack-test (0.6.3) rack (>= 1.0) rails (3.2.6) actionmailer (= 3.2.6) @@ -138,8 +139,11 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (0.9.2.2) - rdoc (3.12) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + rdoc (3.12.2) json (~> 1.4) rspec (2.8.0) rspec-core (~> 2.8.0) @@ -155,8 +159,12 @@ GEM railties (>= 3.0) rspec (~> 2.8.0) rubyzip (0.9.9) - sass (3.1.19) - sass-rails (3.2.5) + sass (3.7.2) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) @@ -167,7 +175,7 @@ GEM rubyzip shoulda-matchers (1.0.0) spork (0.9.0) - sprockets (2.1.3) + sprockets (2.1.4) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) @@ -176,13 +184,13 @@ GEM daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.15.3) - tilt (1.3.3) + thor (0.20.3) + tilt (1.4.1) timecop (0.3.5) - treetop (1.4.10) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.33) + tzinfo (0.3.55) uglifier (1.2.4) execjs (>= 0.3.0) multi_json (>= 1.0.2) @@ -199,7 +207,7 @@ DEPENDENCIES bourbon (= 2.1.0) bourne (= 1.1.1) capybara-webkit (= 0.12.1) - coffee-rails (~> 3.2.1) + coffee-rails (~> 3.2.2) cucumber-rails (= 1.3.0) database_cleaner (= 0.7.1) dynamic_form (= 1.1.4) @@ -222,3 +230,6 @@ DEPENDENCIES uglifier yajl-ruby (= 1.1.0) yui-compressor + +BUNDLED WITH + 1.16.6