updated gemfile and gemfile.lock for v2.7.0

26a45114 · Francisco Juan · b84517cd · 26a45114 · 26a45114
Commit 26a45114 authored Mar 14, 2012 by Francisco Juan
Hide whitespace changes
Inline Side-by-side

Showing with 46 additions and 21 deletions

Gemfile Gemfile +0 -5

Gemfile.lock Gemfile.lock +46 -16

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -60,11 +60,6 @@ platforms :mri do
 end

 platforms :mri_18, :mingw_18 do
-  group :mysql do
-    gem "mysql"
-    #   gem "ruby-mysql"
-  end
-
  group :sqlite do
    gem "sqlite3-ruby", "< 1.3", :require => "sqlite3"
  end

--- a/Gemfile.lock
+++ b/Gemfile.lock
 GEM
  remote: http://rubygems.org/
  specs:
-    actionmailer (2.3.12)
-      actionpack (= 2.3.12)
-    actionpack (2.3.12)
-      activesupport (= 2.3.12)
+    actionmailer (2.3.14)
+      actionpack (= 2.3.14)
+    actionpack (2.3.14)
+      activesupport (= 2.3.14)
      rack (~> 1.1.0)
-    activerecord (2.3.12)
-      activesupport (= 2.3.12)
-    activeresource (2.3.12)
-      activesupport (= 2.3.12)
-    activesupport (2.3.12)
+    activerecord (2.3.14)
+      activesupport (= 2.3.14)
+    activeresource (2.3.14)
+      activesupport (= 2.3.14)
+    activesupport (2.3.14)
+    capybara (1.1.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)
    coderay (0.9.8)
    edavis10-object_daddy (0.4.3)
+    fastercsv (1.5.4)
+    ffi (1.0.11)
    i18n (0.4.2)
    json (1.6.5)
    lockfile (2.1.0)
    metaclass (0.0.1)
+    mime-types (1.17.2)
    mocha (0.10.5)
      metaclass (~> 0.0.1)
+    multi_json (1.1.0)
+    net-ldap (0.2.2)
    net-ssh (2.3.0)
+    nokogiri (1.5.2)
    pg (0.9.0)
    rack (1.1.3)
-    rails (2.3.12)
-      actionmailer (= 2.3.12)
-      actionpack (= 2.3.12)
-      activerecord (= 2.3.12)
-      activeresource (= 2.3.12)
-      activesupport (= 2.3.12)
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (2.3.14)
+      actionmailer (= 2.3.14)
+      actionpack (= 2.3.14)
+      activerecord (= 2.3.14)
+      activeresource (= 2.3.14)
+      activesupport (= 2.3.14)
      rake (>= 0.8.3)
    rake (0.9.2.2)
    rdoc (3.12)
@@ -35,8 +52,17 @@ GEM
    rmagick (2.13.1)
    ruby-openid (2.1.8)
    rubytree (0.5.3)
+    rubyzip (0.9.6.1)
+    selenium-webdriver (2.20.0)
+      childprocess (>= 0.2.5)
+      ffi (~> 1.0)
+      multi_json (~> 1.0)
+      rubyzip
    shoulda (2.10.3)
+    sqlite3 (1.3.4)
    sqlite3-ruby (1.2.5)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)

 PLATFORMS
  ruby
@@ -45,18 +71,22 @@ DEPENDENCIES
  activerecord-jdbcmysql-adapter
  activerecord-jdbcpostgresql-adapter
  activerecord-jdbcsqlite3-adapter
+  capybara
  coderay (~> 0.9.7)
  edavis10-object_daddy
+  fastercsv (~> 1.5.0)
  i18n (~> 0.4.2)
  jruby-openssl
  lockfile
  mocha
+  net-ldap (~> 0.2.2)
  net-ssh
  pg (~> 0.9.0)
-  rails (= 2.3.12)
+  rails (= 2.3.14)
  rdoc (>= 2.4.2)
  rmagick (>= 1.15.17)
  ruby-openid (~> 2.1.4)
  rubytree (~> 0.5.2)
  shoulda (~> 2.10.3)
+  sqlite3
  sqlite3-ruby (< 1.3)