diff options
| -rw-r--r-- | Gemfile | 8 | ||||
| -rw-r--r-- | Gemfile.lock | 28 |
2 files changed, 18 insertions, 18 deletions
@@ -24,8 +24,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' @@ -39,8 +39,8 @@ gem "modernizr-rails", "~> 2.0.6" gem 'gravatar_image_tag' 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 8a7c877e9..5f9ff3db4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,4 +1,16 @@ GIT + remote: git://chouette.dryade.priv/ninoxe + revision: 55d3c3c3f8dde90dc1b30224cefbe679a4ee9786 + 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,20 +60,8 @@ GIT rgeo (~> 0.3.8) GIT - remote: git://github.com/dryade/ninoxe.git - revision: 0f39e9d5591e5c31dee4f259a700532d9e1c882b - 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: f2f45c364246118672ce7700007e84c7318f4eba + remote: git://sim.dryade.priv/user_interface + revision: 55a84bcc7d88c3962cb43eda817bbfa780e4365c specs: user_interface (0.0.1) rails (> 3.1.0) |