update gemfile to chiliproject v2.11.0

5432d581 · Francisco Juan · 88f909c9 · 5432d581
Commit 5432d581 authored Mar 24, 2013 by Francisco Juan
Hide whitespace changes
Inline Side-by-side

Showing with 40 additions and 38 deletions

Gemfile.lock Gemfile.lock +40 -38

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
 GEM
  remote: http://rubygems.org/
  specs:
-    actionmailer (2.3.16)
-      actionpack (= 2.3.16)
-    actionpack (2.3.16)
-      activesupport (= 2.3.16)
+    actionmailer (2.3.18)
+      actionpack (= 2.3.18)
+    actionpack (2.3.18)
+      activesupport (= 2.3.18)
      rack (~> 1.1.0)
-    activerecord (2.3.16)
-      activesupport (= 2.3.16)
-    activeresource (2.3.16)
-      activesupport (= 2.3.16)
-    activesupport (2.3.16)
+    activerecord (2.3.18)
+      activesupport (= 2.3.18)
+    activeresource (2.3.18)
+      activesupport (= 2.3.18)
+    activesupport (2.3.18)
    airbrake (3.1.8)
      activesupport
      builder
      json
    builder (3.2.0)
-    capybara (1.1.2)
+    capybara (2.0.2)
      mime-types (>= 1.16)
      nokogiri (>= 1.3.3)
      rack (>= 1.0.0)
      rack-test (>= 0.5.4)
      selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    childprocess (0.3.1)
-      ffi (~> 1.0.6)
+      xpath (~> 1.0.0)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
    coderay (0.9.8)
    edavis10-object_daddy (0.4.3)
-    fastercsv (1.5.4)
-    ffi (1.0.11)
+    fastercsv (1.5.5)
+    ffi (1.5.0)
    i18n (0.4.2)
-    json (1.6.5)
+    json (1.7.7)
    lockfile (2.1.0)
    metaclass (0.0.1)
-    mime-types (1.17.2)
-    mocha (0.10.5)
+    mime-types (1.21)
+    mocha (0.13.3)
      metaclass (~> 0.0.1)
-    multi_json (1.1.0)
+    multi_json (1.7.2)
    net-ldap (0.2.2)
-    net-ssh (2.3.0)
-    newrelic_rpm (3.4.0)
-    nokogiri (1.5.2)
+    net-ssh (2.6.6)
+    newrelic_rpm (3.6.0.78)
+    nokogiri (1.5.9)
    pg (0.9.0)
-    rack (1.1.3)
-    rack-test (0.6.1)
+    rack (1.1.6)
+    rack-test (0.6.2)
      rack (>= 1.0)
-    rails (2.3.16)
-      actionmailer (= 2.3.16)
-      actionpack (= 2.3.16)
-      activerecord (= 2.3.16)
-      activeresource (= 2.3.16)
-      activesupport (= 2.3.16)
+    rails (2.3.18)
+      actionmailer (= 2.3.18)
+      actionpack (= 2.3.18)
+      activerecord (= 2.3.18)
+      activeresource (= 2.3.18)
+      activesupport (= 2.3.18)
      rake (>= 0.8.3)
    rake (10.0.3)
-    rdoc (3.12)
+    rdoc (4.0.0)
      json (~> 1.4)
-    rmagick (2.13.1)
+    rmagick (2.13.2)
    ruby-openid (2.1.8)
    rubytree (0.5.3)
-    rubyzip (0.9.6.1)
-    selenium-webdriver (2.20.0)
+    rubyzip (0.9.9)
+    selenium-webdriver (2.31.0)
      childprocess (>= 0.2.5)
-      ffi (~> 1.0)
      multi_json (~> 1.0)
      rubyzip
+      websocket (~> 1.0.4)
    shoulda (2.10.3)
-    sqlite3 (1.3.4)
+    sqlite3 (1.3.7)
    sqlite3-ruby (1.2.5)
-    xpath (0.1.4)
+    websocket (1.0.7)
+    xpath (1.0.0)
      nokogiri (~> 1.3)

 PLATFORMS
@@ -84,13 +85,14 @@ DEPENDENCIES
  fastercsv (~> 1.5.0)
  i18n (~> 0.4.2)
  jruby-openssl
+  json (~> 1.7.7)
  lockfile
  mocha
  net-ldap (~> 0.2.2)
  net-ssh
  newrelic_rpm
  pg (~> 0.9.0)
-  rails (= 2.3.16)
+  rails (= 2.3.18)
  rdoc (>= 2.4.2)
  rmagick (>= 1.15.17)
  ruby-openid (~> 2.1.4)