Fix ninoxe version in Gemfile

2 files changed, 19 insertions, 12 deletions

diff --git a/Gemfile b/Gemfile
index b77b27f18..dc2577d76 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@ gem 'RedCloth'
 
 gem "acts_as_tree", :git => "git://github.com/dryade/acts_as_tree.git"
 gem 'apartment', :git => 'git://github.com/dryade/apartment.git'
-gem 'ninoxe', :path => '~/projects/ninoxe' #, :git => 'git://chouette.dryade.priv/ninoxe' #, :path => '~/Projects/Ninoxe'
+gem 'ninoxe', :git => 'git://chouette.dryade.priv/ninoxe' #, :path => '~/Projects/Ninoxe'
 gem 'acts_as_list', '0.1.6'
 gem 'composite_primary_keys', '4.1.2'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 662e94b06..c22c33aa1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,4 +1,16 @@
 GIT
+  remote: git://chouette.dryade.priv/ninoxe
+  revision: dcf5c4e0f9d1abf7524d1ae9bf672276ab978052
+  specs:
+    ninoxe (0.0.8)
+      GeoRuby
+      activerecord (~> 3.1.3)
+      acts_as_list (= 0.1.6)
+      composite_primary_keys (= 4.1.2)
+      geokit
+      rails (= 3.1.3)
+
+GIT
   remote: git://github.com/dryade/activerecord-jdbc-adapter.git
   revision: 0bf424bc3bcaf9f44646976cc4c1a8e9e57f11b4
   specs:
@@ -55,21 +67,11 @@ GIT
     user_interface (0.0.1)
       rails (~> 3.1.0)
 
-PATH
-  remote: ~/projects/ninoxe
-  specs:
-    ninoxe (0.0.8)
-      GeoRuby
-      activerecord (~> 3.1.3)
-      acts_as_list (= 0.1.6)
-      composite_primary_keys (= 4.1.2)
-      geokit
-      rails (= 3.1.3)
-
 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.1.3)
@@ -106,6 +108,7 @@ GEM
     acts_as_list (0.1.6)
     addressable (2.2.8)
     arel (2.2.3)
+    bcrypt-ruby (3.0.1)
     bcrypt-ruby (3.0.1-java)
     bouncy-castle-java (1.5.0146.1)
     builder (3.0.0)
@@ -156,6 +159,7 @@ 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)
@@ -186,6 +190,8 @@ GEM
     jruby-rack (1.1.5)
     json (1.7.3-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)
@@ -206,6 +212,7 @@ GEM
     net-ssh (2.3.0)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
+    nokogiri (1.5.2)
     nokogiri (1.5.2-java)
     orm_adapter (0.0.7)
     polyamorous (0.5.0)