diff options
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 27 |
2 files changed, 19 insertions, 12 deletions
@@ -32,8 +32,8 @@ gem 'RedCloth' gem "acts_as_tree", :git => "git://github.com/dryade/acts_as_tree.git" gem "acts_as_list", :git => "git://github.com/swanandp/acts_as_list.git" gem 'apartment', :git => 'git://github.com/dryade/apartment.git' -#gem 'ninoxe', :git => 'git://chouette.dryade.priv/ninoxe' #, :path => '~/Projects/Ninoxe' -gem 'ninoxe', :path => '~/workspace/chouette/ninoxe' +gem 'ninoxe', :git => 'git://chouette.dryade.priv/ninoxe' #, :path => '~/Projects/Ninoxe' +#gem 'ninoxe', :path => '~/workspace/chouette/ninoxe' # Gems used only for assets and not required # in production environments by default. diff --git a/Gemfile.lock b/Gemfile.lock index 673e72b03..885ab6c40 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,4 +1,15 @@ GIT + remote: git://chouette.dryade.priv/ninoxe + revision: 7b50dc7b0e18cebee2e0073f58a65730e05ca44a + specs: + ninoxe (0.0.8) + GeoRuby + activerecord (~> 3.1.3) + composite_primary_keys (= 4.1.2) + geokit + rails (= 3.1.3) + +GIT remote: git://github.com/dryade/activerecord-jdbc-adapter.git revision: 0bf424bc3bcaf9f44646976cc4c1a8e9e57f11b4 specs: @@ -42,20 +53,11 @@ GIT user_interface (0.0.1) rails (~> 3.1.0) -PATH - remote: ~/workspace/chouette/ninoxe - specs: - ninoxe (0.0.8) - GeoRuby - activerecord (~> 3.1.3) - composite_primary_keys (= 4.1.2) - geokit - rails (= 3.1.3) - GEM remote: http://rubygems.org/ specs: GeoRuby (1.3.4) + RedCloth (4.2.9) RedCloth (4.2.9-java) SyslogLogger (1.4.1) actionmailer (3.1.3) @@ -91,6 +93,7 @@ GEM multi_json (~> 1.0) addressable (2.2.8) arel (2.2.3) + bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1-java) bouncy-castle-java (1.5.0146.1) builder (3.0.0) @@ -136,6 +139,7 @@ GEM factory_girl_rails (1.7.0) factory_girl (~> 2.6.0) railties (>= 3.0.0) + ffi (1.0.11) ffi (1.0.11-java) formtastic (2.0.2) rails (~> 3.0) @@ -162,6 +166,8 @@ GEM bouncy-castle-java (>= 1.5.0146.1) jruby-rack (1.1.5) json (1.7.1-java) + launchy (2.1.0) + addressable (~> 2.2.6) launchy (2.1.0-java) addressable (~> 2.2.6) ffi (~> 1.0.9) @@ -182,6 +188,7 @@ GEM net-ssh (2.3.0) net-ssh-gateway (1.1.0) net-ssh (>= 1.99.1) + nokogiri (1.5.2) nokogiri (1.5.2-java) orm_adapter (0.0.7) polyamorous (0.5.0) |