aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gemfile4
-rw-r--r--Gemfile.lock22
2 files changed, 13 insertions, 13 deletions
diff --git a/Gemfile b/Gemfile
index 6cbb2ad0b..202f9b18d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -39,9 +39,9 @@ gem 'gravatar_image_tag'
gem 'calendar_helper', :git => "git://github.com/topfunky/calendar_helper.git"
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://github.com/dryade/ninoxe.git'
#gem 'ninoxe', :git => 'git://github.com/dryade/ninoxe.git', :branch => 'V2_0_0'
-gem 'ninoxe', :git => 'git://chouette.dryade.priv/ninoxe' #, :path => '~/Projects/Ninoxe'
+#gem 'ninoxe', :git => 'git://chouette.dryade.priv/ninoxe' #, :path => '~/Projects/Ninoxe'
#gem 'ninoxe', :path => '~/workspace/chouette/ninoxe'
gem 'acts_as_list', '0.1.6'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4d244381e..bae9f8da5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,15 +1,4 @@
GIT
- remote: git://chouette.dryade.priv/ninoxe
- revision: 3a1b90a5954bdf262d257e7e9ba1d13d27a1a95e
- specs:
- ninoxe (0.0.8)
- GeoRuby
- activerecord (>= 3.1.3)
- acts_as_list (>= 0.1.6)
- geokit
- rails (>= 3.1.3)
-
-GIT
remote: git://github.com/dnagir/database_cleaner.git
revision: 0c0aa44f13ae392000a6f506b62d5d1602cb4e53
branch: postgre_jruby_issue
@@ -59,6 +48,17 @@ GIT
rgeo (~> 0.3.8)
GIT
+ remote: git://github.com/dryade/ninoxe.git
+ revision: 02bb6ced9fd216384b8389f3d24660484741158e
+ specs:
+ ninoxe (0.0.8)
+ GeoRuby
+ activerecord (>= 3.1.3)
+ acts_as_list (>= 0.1.6)
+ geokit
+ rails (>= 3.1.3)
+
+GIT
remote: git://github.com/topfunky/calendar_helper.git
revision: 763a497dbd8833b98d92815667b367ade938c00c
specs: