aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Etienne2012-07-31 16:07:08 +0200
committerMichel Etienne2012-07-31 16:07:08 +0200
commit1ff04594cc7a7ea08446ee0b0200685213811e68 (patch)
tree827905c87c89b82afb638ed184691ed2009b6e19
parenta03e86d44fbe79f6f168426b5881f278acf1af69 (diff)
downloadchouette-core-1ff04594cc7a7ea08446ee0b0200685213811e68.tar.bz2
gemfile on local libs
-rw-r--r--Gemfile8
-rw-r--r--Gemfile.lock26
2 files changed, 17 insertions, 17 deletions
diff --git a/Gemfile b/Gemfile
index fde92a29a..f2c5fd3fc 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 'acts_as_list', '0.1.6'
#gem 'composite_primary_keys', '~> 5.0.8'
diff --git a/Gemfile.lock b/Gemfile.lock
index 255b14eb8..eb1a5fe96 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,4 +1,16 @@
GIT
+ remote: git://chouette.dryade.priv/ninoxe
+ revision: 2bbf27be9a282188d31399790d7ba1951cb27a2b
+ 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
@@ -48,19 +60,7 @@ GIT
rgeo (~> 0.3.13)
GIT
- remote: git://github.com/dryade/ninoxe.git
- revision: 2bbf27be9a282188d31399790d7ba1951cb27a2b
- 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
+ remote: git://sim.dryade.priv/user_interface
revision: 6931e642037ffef9d3818669a5f5167a0298b30b
specs:
user_interface (0.0.1)