aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Florisson2012-07-20 17:52:45 +0200
committerMarc Florisson2012-07-20 17:52:45 +0200
commit2e653a7bd3c8e0d568bbe19203da6b996ba02c9b (patch)
treeb626addd648e8ba3885c794102d24404b183a119
parent797b05bae912a49dfaefe1cc26c332b5cf677f03 (diff)
downloadchouette-core-2e653a7bd3c8e0d568bbe19203da6b996ba02c9b.tar.bz2
Update Gemfile for github repo
-rw-r--r--Gemfile8
-rw-r--r--Gemfile.lock28
2 files changed, 18 insertions, 18 deletions
diff --git a/Gemfile b/Gemfile
index f2c5fd3fc..fde92a29a 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 eb1a5fe96..aa6f69dd4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,16 +1,4 @@
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
@@ -60,8 +48,20 @@ GIT
rgeo (~> 0.3.13)
GIT
- remote: git://sim.dryade.priv/user_interface
- revision: 6931e642037ffef9d3818669a5f5167a0298b30b
+ 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
+ revision: 6e4654e6805091cb8b485e36730176af3dc4e581
specs:
user_interface (0.0.1)
rails (> 3.1.0)