diff --git a/Gemfile.lock b/Gemfile.lock index 65f0062..c896874 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,8 +1,8 @@ GIT remote: git@github.com:spacemunkay/acts_as_loggable.git - revision: bacd43a1de10edd3eac0fefc6dcc35ca282e416a + revision: fd2c276abad00567a294a1a841dce9861e240c82 specs: - acts_as_loggable (0.0.3) + acts_as_loggable (0.0.6) activerecord (>= 3.0) activesupport (~> 3.0) @@ -42,7 +42,7 @@ GEM bootstrap-will_paginate (0.0.9) will_paginate builder (3.0.4) - capybara (1.1.3) + capybara (1.1.4) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -76,21 +76,20 @@ GEM factory_girl_rails (1.7.0) factory_girl (~> 2.6.0) railties (>= 3.0.0) - ffi (1.1.5) + ffi (1.2.0) gherkin (2.11.5) json (>= 1.4.6) - guard (1.5.4) - listen (>= 0.4.2) + guard (1.6.1) + listen (>= 0.6.0) lumberjack (>= 1.0.2) pry (>= 0.9.10) thor (>= 0.14.6) guard-rspec (1.2.1) guard (>= 1.1) - guard-spork (1.2.3) + guard-spork (1.4.0) childprocess (>= 0.2.3) guard (>= 1.1) spork (>= 0.8.4) - sys-proctable haml (3.1.7) haml-rails (0.3.5) actionpack (>= 3.1, < 4.1) @@ -100,10 +99,10 @@ GEM hike (1.2.1) i18n (0.6.1) journey (1.0.4) - jquery-rails (2.1.3) - railties (>= 3.1.0, < 5.0) - thor (~> 0.14) - json (1.7.5) + jquery-rails (2.1.4) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (1.7.6) launchy (2.1.2) addressable (~> 2.3) less (2.2.2) @@ -112,9 +111,10 @@ GEM actionpack (>= 3.1) less (~> 2.2.0) libv8 (3.3.10.4) - libwebsocket (0.1.5) + libwebsocket (0.1.7.1) addressable - listen (0.5.3) + websocket + listen (0.7.0) lumberjack (1.0.2) mail (2.4.4) i18n (>= 0.4.0) @@ -122,8 +122,12 @@ GEM treetop (~> 1.4.8) method_source (0.8.1) mime-types (1.19) - multi_json (1.3.7) - nokogiri (1.5.5) + multi_json (1.5.0) + netzke-basepack (0.8.1) + netzke-core (~> 0.8.0) + netzke-core (0.8.1) + activesupport (>= 3.1.0) + nokogiri (1.5.6) orm_adapter (0.0.7) polyglot (0.3.3) pry (0.9.10) @@ -152,8 +156,8 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.6) - rake (0.9.2.2) - rb-fsevent (0.9.2) + rake (10.0.3) + rb-fsevent (0.9.3) rdoc (3.12) json (~> 1.4) rspec (2.8.0) @@ -170,12 +174,12 @@ GEM railties (>= 3.0) rspec (~> 2.8.0) rubyzip (0.9.9) - sass (3.2.3) + sass (3.2.5) sass-rails (3.2.5) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - selenium-webdriver (2.26.0) + selenium-webdriver (2.27.2) childprocess (>= 0.2.5) libwebsocket (~> 0.1.3) multi_json (~> 1.0) @@ -188,7 +192,6 @@ GEM rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.6) - sys-proctable (0.9.2) therubyracer (0.10.2) libv8 (~> 3.3.10) thor (0.14.6) @@ -210,6 +213,7 @@ GEM multi_json (~> 1.0, >= 1.0.2) warden (1.1.1) rack (>= 1.0) + websocket (1.0.6) will_paginate (3.0.3) xpath (0.1.4) nokogiri (~> 1.3) @@ -231,6 +235,8 @@ DEPENDENCIES haml-rails (~> 0.3.4) jquery-rails (~> 2.0) launchy + netzke-basepack (~> 0.8.0) + netzke-core (~> 0.8.0) pry (~> 0.9.8) rails (= 3.2.1) rb-fsevent