aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Etienne2012-08-06 07:26:46 +0200
committerMichel Etienne2012-08-06 07:26:46 +0200
commite3308dcb00e8de529a1992c8559648e7a0300ffd (patch)
treee557316604cfb71d6ac45a5a0ad0d9584554ab37
parent7e7d452e59fb6dddce09e616a0d229930dd4dc5d (diff)
downloadchouette-core-e3308dcb00e8de529a1992c8559648e7a0300ffd.tar.bz2
switch dependencies on github
-rw-r--r--Gemfile8
-rw-r--r--Gemfile.lock29
2 files changed, 19 insertions, 18 deletions
diff --git a/Gemfile b/Gemfile
index 083872f03..fd2c625c1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,8 +22,8 @@ end
gem "map_layers", "~> 0.0.4"
gem "georuby-ext", :git => 'git://github.com/dryade/georuby-ext.git'
-#gem 'user_interface', :git => 'git://github.com/dryade/user-interface.git'
-gem 'user_interface', :git => 'git://sim.dryade.priv/user_interface' #, :path => '~/Projects/UserInterfaceDryade'
+gem 'user_interface', :git => 'git://github.com/dryade/user-interface.git'
+#gem 'user_interface', :git => 'git://sim.dryade.priv/user_interface' #, :path => '~/Projects/UserInterfaceDryade'
gem 'json'
gem 'cocoon'
gem 'formtastic'
@@ -36,8 +36,8 @@ gem 'jquery-rails'
gem "modernizr-rails", "~> 2.0.6"
gem "acts_as_tree", :git => "git://github.com/dryade/acts_as_tree.git"
-#gem 'ninoxe', :git => 'git://github.com/dryade/ninoxe.git'
-gem 'ninoxe', :git => 'git://chouette.dryade.priv/ninoxe' #, :path => '~/Projects/Ninoxe'
+gem 'ninoxe', :git => 'git://github.com/dryade/ninoxe.git'
+#gem 'ninoxe', :git => 'git://chouette.dryade.priv/ninoxe' #, :path => '~/Projects/Ninoxe'
#gem 'ninoxe', :path => '~/workspace/chouette/ninoxe'
gem 'acts_as_list', '0.1.6'
diff --git a/Gemfile.lock b/Gemfile.lock
index e15775669..0998b11be 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,16 +1,4 @@
GIT
- remote: git://chouette.dryade.priv/ninoxe
- revision: a676372aa170b006c3694110fe63f6d0e6ecbbdc
- 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/dnagir/database_cleaner.git
revision: 0c0aa44f13ae392000a6f506b62d5d1602cb4e53
branch: postgre_jruby_issue
@@ -60,8 +48,20 @@ GIT
rgeo (~> 0.3.8)
GIT
- remote: git://sim.dryade.priv/user_interface
- revision: 1afb74d751bbe0cef2736e992788aa7d5237f770
+ remote: git://github.com/dryade/ninoxe.git
+ revision: a676372aa170b006c3694110fe63f6d0e6ecbbdc
+ 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/user-interface.git
+ revision: ca1eab6a45687e15bdcbc46385c233fa2becd084
specs:
user_interface (0.0.1)
rails (> 3.1.0)
@@ -188,6 +188,7 @@ GEM
jruby-rack (1.1.6)
jruby-rack-worker (0.3-java)
jruby-rack (>= 1.0.1)
+ json (1.7.4)
json (1.7.4-java)
json_pure (1.7.3)
launchy (2.1.0)