aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Etienne2014-04-11 14:25:30 +0200
committerMichel Etienne2014-04-11 14:25:30 +0200
commit461b1e33e5495820ac34f8a1b18c1986a5c90b08 (patch)
tree866c0dd9fdbe432b9a206469ef6c8c55f9dc3f08
parent6cf87359432ad133d4586604a957dd2ab917876b (diff)
downloadchouette-core-461b1e33e5495820ac34f8a1b18c1986a5c90b08.tar.bz2
link to new ninoxe version
-rw-r--r--Gemfile6
-rw-r--r--Gemfile.lock17
2 files changed, 15 insertions, 8 deletions
diff --git a/Gemfile b/Gemfile
index 6231125dc..176514810 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,8 +52,10 @@ gem 'google-analytics-rails'
gem 'will_paginate', '~> 3.0'
gem 'ransack'
gem 'squeel'
-#gem 'ninoxe', :git => 'git://github.com/dryade/ninoxe.git'
-gem 'ninoxe', '0.1.6'
+gem 'ninoxe', :git => 'git://github.com/afimb/ninoxe.git'
+#gem 'ninoxe',:path => '~/workspace/chouette/ninoxe'
+#gem 'ninoxe', '0.1.7'
+
gem 'acts_as_list', '0.1.6'
gem "acts_as_tree-1.8", '1.1.0', :require => "acts_as_tree"
gem "active_enum"
diff --git a/Gemfile.lock b/Gemfile.lock
index aa4645c7c..889062c6c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,13 @@
+GIT
+ remote: git://github.com/afimb/ninoxe.git
+ revision: 1eefe94c14881a8691883f50a3a51e229e60fa20
+ specs:
+ ninoxe (0.1.6)
+ activerecord (>= 3.1.3, < 3.2.14)
+ acts_as_list (~> 0.1.6)
+ foreigner (= 1.6.0)
+ georuby-ext (= 0.0.5)
+
GEM
remote: http://rubygems.org/
specs:
@@ -184,11 +194,6 @@ GEM
net-ssh (2.6.2)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
- ninoxe (0.1.6)
- activerecord (>= 3.1.3, < 3.2.14)
- acts_as_list (~> 0.1.6)
- foreigner (= 1.6.0)
- georuby-ext (= 0.0.5)
nokogiri (1.5.10)
nokogiri (1.5.10-java)
open4 (1.3.0)
@@ -360,7 +365,7 @@ DEPENDENCIES
map_layers (= 0.0.4)
modernizr-rails (~> 2.0.6)
morrisjs-rails
- ninoxe (= 0.1.6)
+ ninoxe!
pg (~> 0.11.0)
rabl
rails (= 3.2.6)