merge gemfile

1 files changed, 35 insertions, 48 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 3f0af8497..efaaf4112 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -30,14 +30,14 @@ GIT
 
 GIT
   remote: git://github.com/dryade/ffi-proj4.git
-  revision: b3d868126f939030912dcf048c9fe1b54a2ad761
+  revision: 7ae89176e8ddc1c2175192ecbff0e9cffbedcb99
   specs:
     ffi-proj4 (0.0.1)
       ffi (~> 1.0.0)
 
 GIT
   remote: git://github.com/dryade/georuby-ext.git
-  revision: 809e03122b9e7d6881f7132b90b90720eaaab766
+  revision: be03b9d2e43f970eb368ab52c19b9dbfc68cc540
   specs:
     georuby-ext (0.0.1)
       activesupport
@@ -45,7 +45,7 @@ GIT
       geokit
       georuby
       json_pure
-      rgeo (~> 0.3.13)
+      rgeo (~> 0.3.8)
 
 GIT
   remote: git://github.com/dryade/ninoxe.git
@@ -70,7 +70,6 @@ GEM
   remote: http://rubygems.org/
   specs:
     GeoRuby (1.3.4)
-    RedCloth (4.2.9)
     RedCloth (4.2.9-java)
     SyslogLogger (1.4.1)
     actionmailer (3.2.6)
@@ -106,7 +105,6 @@ GEM
     acts_as_list (0.1.6)
     addressable (2.2.8)
     arel (3.0.2)
-    bcrypt-ruby (3.0.1)
     bcrypt-ruby (3.0.1-java)
     bouncy-castle-java (1.5.0146.1)
     builder (3.0.0)
@@ -125,8 +123,8 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.3.2)
-      ffi (~> 1.0.6)
+    childprocess (0.3.4)
+      ffi (~> 1.0, >= 1.0.6)
     cocoon (1.0.22)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
@@ -142,11 +140,11 @@ GEM
     delayed_job_active_record (0.3.2)
       activerecord (> 2.1.0)
       delayed_job (~> 3.0.0)
-    devise (2.1.0)
+    devise (2.1.2)
       bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.0.7)
+      orm_adapter (~> 0.1)
       railties (~> 3.1)
-      warden (~> 1.1.1)
+      warden (~> 1.2.1)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     execjs (1.4.0)
@@ -156,7 +154,6 @@ GEM
     factory_girl_rails (1.7.0)
       factory_girl (~> 2.6.0)
       railties (>= 3.0.0)
-    ffi (1.0.11)
     ffi (1.0.11-java)
     ffi-geos (0.0.4)
       ffi (~> 1.0.0)
@@ -165,13 +162,13 @@ GEM
     geokit (1.6.5)
       multi_json
     georuby (1.9.7)
-    guard (1.1.1)
+    guard (1.2.3)
       listen (>= 0.4.2)
       thor (>= 0.14.6)
-    guard-rspec (1.0.1)
+    guard-rspec (1.2.0)
       guard (>= 1.1)
     has_scope (0.5.1)
-    highline (1.6.12)
+    highline (1.6.13)
     hike (1.2.1)
     i18n (0.6.0)
     inherited_resources (1.3.1)
@@ -179,8 +176,8 @@ GEM
       responders (~> 0.6)
     jdbc-postgres (9.0.801)
     journey (1.0.4)
-    jquery-rails (1.0.19)
-      railties (~> 3.0)
+    jquery-rails (2.0.2)
+      railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
     jruby-jars (1.6.7.2)
     jruby-openssl (0.7.7)
@@ -191,16 +188,13 @@ GEM
     json (1.7.4)
     json (1.7.4-java)
     json_pure (1.7.3)
-    launchy (2.1.0)
-      addressable (~> 2.2.6)
     launchy (2.1.0-java)
       addressable (~> 2.2.6)
       ffi (~> 1.0.9)
       spoon (~> 0.0.1)
-    libv8 (3.3.10.4)
-    libwebsocket (0.1.3)
+    libwebsocket (0.1.4)
       addressable
-    listen (0.4.5)
+    listen (0.4.7)
       rb-fchange (~> 0.0.5)
       rb-fsevent (~> 0.9.1)
       rb-inotify (~> 0.8.8)
@@ -219,10 +213,8 @@ GEM
     net-ssh (2.5.2)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
-    nokogiri (1.5.4)
-    nokogiri (1.5.4-java)
-    orm_adapter (0.0.7)
-    pg (0.11.0)
+    nokogiri (1.5.5-java)
+    orm_adapter (0.4.0)
     polyamorous (0.5.0)
       activerecord (~> 3.0)
     polyglot (0.3.3)
@@ -269,48 +261,44 @@ GEM
       remarkable (~> 4.0.0.alpha4)
       remarkable_activemodel (~> 4.0.0.alpha4)
       rspec (>= 2.0.0.alpha11)
-    responders (0.9.1)
+    responders (0.9.2)
       railties (~> 3.1)
-    rgeo (0.3.13)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
+    rgeo (0.3.14)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    rspec-rails (2.10.1)
+    rspec-mocks (2.11.1)
+    rspec-rails (2.11.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.10.0)
-    rubyzip (0.9.8)
+      rspec (~> 2.11.0)
+    rubyzip (0.9.9)
     sass (3.1.20)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.22.2)
+    selenium-webdriver (2.25.0)
       childprocess (>= 0.2.5)
-      ffi (~> 1.0)
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
-    shoulda-matchers (1.1.0)
+    shoulda-matchers (1.2.0)
       activesupport (>= 3.0.0)
     spoon (0.0.1)
     sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    squeel (1.0.5)
+    squeel (1.0.7)
       activerecord (~> 3.0)
       activesupport (~> 3.0)
       polyamorous (~> 0.5.0)
-    therubyracer (0.10.1)
-      libv8 (~> 3.3.10)
     therubyrhino (1.73.4)
     thor (0.15.4)
     tilt (1.3.3)
@@ -318,15 +306,15 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.33)
-    uglifier (1.2.4)
+    uglifier (1.2.6)
       execjs (>= 0.3.0)
-      multi_json (>= 1.0.2)
+      multi_json (~> 1.3)
     warbler (1.3.5)
       jruby-jars (>= 1.4.0)
       jruby-rack (>= 1.0.0)
       rake (>= 0.8.7)
       rubyzip (>= 0.9.4)
-    warden (1.1.1)
+    warden (1.2.1)
       rack (>= 1.0)
     will_paginate (3.0.3)
     xpath (0.1.4)
@@ -334,7 +322,6 @@ GEM
 
 PLATFORMS
   java
-  ruby
 
 DEPENDENCIES
   RedCloth