diff options
| author | Michel Etienne | 2012-07-06 15:12:37 +0200 |
|---|---|---|
| committer | Michel Etienne | 2012-07-06 15:12:37 +0200 |
| commit | 25cda96edddc62186236f37db3daef79b068491e (patch) | |
| tree | 65c462c9a25953893ec1031fc540c9c15bac2fbe | |
| parent | 3a291e506dd0d5c9fedc83b97948dbaf1c42d8fe (diff) | |
| download | chouette-core-25cda96edddc62186236f37db3daef79b068491e.tar.bz2 | |
return to dryade
| -rw-r--r-- | Gemfile | 8 | ||||
| -rw-r--r-- | Gemfile.lock | 36 |
2 files changed, 22 insertions, 22 deletions
@@ -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 3a446184e..f7298e6f3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,4 +1,16 @@ GIT + remote: git://chouette.dryade.priv/ninoxe + revision: 34f3b94569b35d8ce51e2b036c12e067e2222eec + 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,32 +60,20 @@ GIT rgeo (~> 0.3.13) GIT - remote: git://github.com/dryade/ninoxe.git - revision: 34f3b94569b35d8ce51e2b036c12e067e2222eec + remote: git://github.com/thoughtbot/shoulda.git + revision: 269edccc7df8f2eb94a96a6a6d248a5960d7fe1f 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) + shoulda (3.0.1) + shoulda-context (~> 1.0) + shoulda-matchers (~> 1.0) GIT - remote: git://github.com/dryade/user-interface.git + remote: git://sim.dryade.priv/user_interface revision: 6931e642037ffef9d3818669a5f5167a0298b30b specs: user_interface (0.0.1) rails (> 3.1.0) -GIT - remote: git://github.com/thoughtbot/shoulda.git - revision: 269edccc7df8f2eb94a96a6a6d248a5960d7fe1f - specs: - shoulda (3.0.1) - shoulda-context (~> 1.0) - shoulda-matchers (~> 1.0) - GEM remote: http://rubygems.org/ specs: |
